alxarafe / alixar

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

Indentation +1471 added lines, -1471 removed lines

@@ -35,122 +35,122 @@ 
  */
 function project_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Project");
-	$head[$h][2] = 'project';
-	$h++;
-
-	$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>';
-	$head[$h][2] = 'contact';
-	$h++;
-
-	if (empty($conf->global->PROJECT_HIDE_TASKS))
-	{
-		// Then tab for sub level of projet, i mean tasks
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Tasks");
-
-		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-		$taskstatic=new Task($db);
-		$nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
-		if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
-		$head[$h][2] = 'tasks';
-		$h++;
-
-		$nbTimeSpent=0;
-		$sql = "SELECT t.rowid";
-		//$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
-		//$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt";
-		$sql .= " WHERE t.fk_task = pt.rowid";
-		$sql .= " AND pt.fk_projet =".$object->id;
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $nbTimeSpent=1;
-		}
-		else dol_print_error($db);
-
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;
-		$head[$h][1] = $langs->trans("TimeSpent");
-		if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
-		$head[$h][2] = 'timespent';
-		$h++;
-	}
-
-	if (! empty($conf->fournisseur->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled)
-		|| ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled)
-		|| ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("ProjectOverview");
-		$head[$h][2] = 'element';
-		$h++;
-	}
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'project');
-
-
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
-		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-		$head[$h][2] = 'notes';
-		$h++;
-	}
-
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-	$nbLinks=Link::count($db, $object->element, $object->id);
-	$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>';
-	$head[$h][2] = 'document';
-	$h++;
-
-	// Manage discussion
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT))
-	{
-		$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>';
-		$head[$h][2] = 'project_comment';
-		$h++;
-	}
-
-	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$object->id;
-	$head[$h][1].= $langs->trans("Events");
-	if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
-	{
-		$head[$h][1].= '/';
-		$head[$h][1].= $langs->trans("Agenda");
-	}
-	$head[$h][2] = 'agenda';
-	$h++;
-
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'project','remove');
-
-	return $head;
+    global $db, $langs, $conf, $user;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Project");
+    $head[$h][2] = 'project';
+    $h++;
+
+    $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>';
+    $head[$h][2] = 'contact';
+    $h++;
+
+    if (empty($conf->global->PROJECT_HIDE_TASKS))
+    {
+        // Then tab for sub level of projet, i mean tasks
+        $head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("Tasks");
+
+        require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+        $taskstatic=new Task($db);
+        $nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
+        if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+        $head[$h][2] = 'tasks';
+        $h++;
+
+        $nbTimeSpent=0;
+        $sql = "SELECT t.rowid";
+        //$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
+        //$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt";
+        $sql .= " WHERE t.fk_task = pt.rowid";
+        $sql .= " AND pt.fk_projet =".$object->id;
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $nbTimeSpent=1;
+        }
+        else dol_print_error($db);
+
+        $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;
+        $head[$h][1] = $langs->trans("TimeSpent");
+        if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
+        $head[$h][2] = 'timespent';
+        $h++;
+    }
+
+    if (! empty($conf->fournisseur->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled)
+        || ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled)
+        || ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("ProjectOverview");
+        $head[$h][2] = 'element';
+        $h++;
+    }
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'project');
+
+
+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+    {
+        $nbNote = 0;
+        if(!empty($object->note_private)) $nbNote++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
+        $head[$h][1] = $langs->trans('Notes');
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'notes';
+        $h++;
+    }
+
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+    $upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $nbLinks=Link::count($db, $object->element, $object->id);
+    $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>';
+    $head[$h][2] = 'document';
+    $h++;
+
+    // Manage discussion
+    if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT))
+    {
+        $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>';
+        $head[$h][2] = 'project_comment';
+        $h++;
+    }
+
+    $head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$object->id;
+    $head[$h][1].= $langs->trans("Events");
+    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+    {
+        $head[$h][1].= '/';
+        $head[$h][1].= $langs->trans("Agenda");
+    }
+    $head[$h][2] = 'agenda';
+    $h++;
+
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'project','remove');
+
+    return $head;
 }
 
 
@@ -162,86 +162,86 @@ 
  */
 function task_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'task_task';
-	$h++;
-
-	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-	$head[$h][1] = $langs->trans("TaskRessourceLinks");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-	$head[$h][2] = 'task_contact';
-	$h++;
-
-	// Is there timespent ?
-	$nbTimeSpent=0;
-	$sql = "SELECT t.rowid";
-	//$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
-	//$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
-	$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
-	$sql .= " WHERE t.fk_task =".$object->id;
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$obj = $db->fetch_object($resql);
-		if ($obj) $nbTimeSpent=1;
-	}
-	else dol_print_error($db);
-
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-	$head[$h][1] = $langs->trans("TimeSpent");
-	if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
-	$head[$h][2] = 'task_time';
-	$h++;
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'task');
-
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
-		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-		$head[$h][2] = 'task_notes';
-		$h++;
-	}
-
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-	$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref);
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	include_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview.*\.png)$'));
-	$nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'task_document';
-	$h++;
-
-	// Manage discussion
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK))
-	{
-		$nbComments = $object->getNbComments();
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
-		$head[$h][2] = 'task_comment';
-		$h++;
-	}
-
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'task','remove');
-
-	return $head;
+    global $db, $langs, $conf, $user;
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'task_task';
+    $h++;
+
+    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+    $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+    $head[$h][1] = $langs->trans("TaskRessourceLinks");
+    if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+    $head[$h][2] = 'task_contact';
+    $h++;
+
+    // Is there timespent ?
+    $nbTimeSpent=0;
+    $sql = "SELECT t.rowid";
+    //$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
+    //$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
+    $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+    $sql .= " WHERE t.fk_task =".$object->id;
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $obj = $db->fetch_object($resql);
+        if ($obj) $nbTimeSpent=1;
+    }
+    else dol_print_error($db);
+
+    $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+    $head[$h][1] = $langs->trans("TimeSpent");
+    if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
+    $head[$h][2] = 'task_time';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'task');
+
+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+    {
+        $nbNote = 0;
+        if(!empty($object->note_private)) $nbNote++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+        $head[$h][1] = $langs->trans('Notes');
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'task_notes';
+        $h++;
+    }
+
+    $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+    $filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref);
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    include_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+    $nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $nbLinks=Link::count($db, $object->element, $object->id);
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'task_document';
+    $h++;
+
+    // Manage discussion
+    if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK))
+    {
+        $nbComments = $object->getNbComments();
+        $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+        $head[$h][1] = $langs->trans("CommentLink");
+        if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+        $head[$h][2] = 'task_comment';
+        $h++;
+    }
+
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'task','remove');
+
+    return $head;
 }
 
 /**
@@ -253,33 +253,33 @@ 
  */
 function project_timesheet_prepare_head($mode, $fuser=null)
 {
-	global $langs, $conf, $user;
-	$h = 0;
-	$head = array();
-
-	$h = 0;
-
-	$param='';
-	$param.=($mode?'&mode='.$mode:'');
-	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param.='&search_usertoprocessid='.$fuser->id;
-
-	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param?'?'.$param:'');
-		$head[$h][1] = $langs->trans("InputPerWeek");
-		$head[$h][2] = 'inputperweek';
-		$h++;
-	}
-
-	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param?'?'.$param:'');
-		$head[$h][1] = $langs->trans("InputPerDay");
-		$head[$h][2] = 'inputperday';
-		$h++;
-	}
-
-	/*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
+
+    $h = 0;
+
+    $param='';
+    $param.=($mode?'&mode='.$mode:'');
+    if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param.='&search_usertoprocessid='.$fuser->id;
+
+    if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param?'?'.$param:'');
+        $head[$h][1] = $langs->trans("InputPerWeek");
+        $head[$h][2] = 'inputperweek';
+        $h++;
+    }
+
+    if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param?'?'.$param:'');
+        $head[$h][1] = $langs->trans("InputPerDay");
+        $head[$h][2] = 'inputperday';
+        $h++;
+    }
+
+    /*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
 		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perline.php".($param?'?'.$param:'');
 		$head[$h][1] = $langs->trans("InputDetail");
@@ -287,11 +287,11 @@ 
 		$h++;
 	}*/
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet');
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet','remove');
 
-	return $head;
+    return $head;
 }
 
 
@@ -302,32 +302,32 @@ 
  */
 function project_admin_prepare_head()
 {
-	global $langs, $conf, $user;
-	$h = 0;
-	$head = array();
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
 
-	$h = 0;
+    $h = 0;
 
-	$head[$h][0] = DOL_URL_ROOT."/projet/admin/project.php";
-	$head[$h][1] = $langs->trans("Projects");
-	$head[$h][2] = 'project';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/projet/admin/project.php";
+    $head[$h][1] = $langs->trans("Projects");
+    $head[$h][2] = 'project';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin');
 
-	$head[$h][0] = DOL_URL_ROOT."/projet/admin/project_extrafields.php";
-	$head[$h][1] = $langs->trans("ExtraFieldsProject");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/projet/admin/project_extrafields.php";
+    $head[$h][1] = $langs->trans("ExtraFieldsProject");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/admin/project_task_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsProjectTask");
-	$head[$h][2] = 'attributes_task';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/projet/admin/project_task_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsProjectTask");
+    $head[$h][2] = 'attributes_task';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 
@@ -349,284 +349,284 @@ 
  */
 function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId='', $addordertick=0, $projectidfortotallink=0, $filterprogresscalc='')
 {
-	global $user, $bc, $langs, $conf, $db;
-	global $projectstatic, $taskstatic;
-
-	$lastprojectid=0;
-
-	$projectsArrayId=explode(',',$projectsListId);
-	if ($filterprogresscalc!=='') {
-		foreach ($lines as $key=>$line) {
-			if (!empty($line->planned_workload) && !empty($line->duration)) {
-				$filterprogresscalc = str_replace(' = ', ' == ', $filterprogresscalc);
-				if (!eval($filterprogresscalc)) {
-					unset($lines[$key]);
-				}
-			}
-		}
-		$lines=array_values($lines);
-	}
-
-	$numlines=count($lines);
-
-	// We declare counter as global because we want to edit them into recursive call
-	global $total_projectlinesa_spent,$total_projectlinesa_planned,$total_projectlinesa_spent_if_planned;
-	if ($level == 0)
-	{
-		$total_projectlinesa_spent=0;
-		$total_projectlinesa_planned=0;
-		$total_projectlinesa_spent_if_planned=0;
-	}
-
-	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
-
-		// 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
-		{
-			// Show task line.
-			$showline=1;
-			$showlineingray=0;
-
-			// If there is filters to use
-			if (is_array($taskrole))
-			{
-				// If task not legitimate to show, search if a legitimate task exists later in tree
-				if (! isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent)
-				{
-					// So search if task has a subtask legitimate to show
-					$foundtaskforuserdeeper=0;
-					searchTaskInChild($foundtaskforuserdeeper,$lines[$i]->id,$lines,$taskrole);
-					//print '$foundtaskforuserpeeper='.$foundtaskforuserdeeper.'<br>';
-					if ($foundtaskforuserdeeper > 0)
-					{
-						$showlineingray=1;		// We will show line but in gray
-					}
-					else
-					{
-						$showline=0;			// No reason to show line
-					}
-				}
-			}
-			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).
-				if (empty($user->rights->projet->all->lire))
-				{
-					// User is not allowed on this project and project is not public, so we hide line
-					if (! in_array($lines[$i]->fk_project, $projectsArrayId))
-					{
-						// Note that having a user assigned to a task into a project user has no permission on, should not be possible
-						// because assignement on task can be done only on contact of project.
-						// If assignement was done and after, was removed from contact of project, then we can hide the line.
-						$showline=0;
-					}
-				}
-			}
-
-			if ($showline)
-			{
-				// Break on a new project
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-				{
-					$var = !$var;
-					$lastprojectid=$lines[$i]->fk_project;
-				}
-
-				print '<tr '.$bc[$var].' id="row-'.$lines[$i]->id.'">'."\n";
-
-				if ($showproject)
-				{
-					// Project ref
-					print "<td>";
-					//if ($showlineingray) print '<i>';
-					$projectstatic->id=$lines[$i]->fk_project;
-					$projectstatic->ref=$lines[$i]->projectref;
-					$projectstatic->public=$lines[$i]->public;
-					$projectstatic->title=$lines[$i]->projectlabel;
-					if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
-					else print $projectstatic->getNomUrl(1,'nolink');
-					//if ($showlineingray) print '</i>';
-					print "</td>";
-
-					// Project status
-					print '<td>';
-					$projectstatic->statut=$lines[$i]->projectstatus;
-					print $projectstatic->getLibStatut(2);
-					print "</td>";
-				}
-
-				// Ref of task
-				print '<td>';
-				if ($showlineingray)
-				{
-					print '<i>'.img_object('','projecttask').' '.$lines[$i]->ref.'</i>';
-				}
-				else
-				{
-					$taskstatic->id=$lines[$i]->id;
-					$taskstatic->ref=$lines[$i]->ref;
-					$taskstatic->label=($taskrole[$lines[$i]->id]?$langs->trans("YourRole").': '.$taskrole[$lines[$i]->id]:'');
-					print $taskstatic->getNomUrl(1,'withproject');
-				}
-				print '</td>';
-
-				// Title of task
-				print "<td>";
-				if ($showlineingray) print '<i>';
-				//else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
-				for ($k = 0 ; $k < $level ; $k++)
-				{
-					print "&nbsp; &nbsp; &nbsp;";
-				}
-				print $lines[$i]->label;
-				if ($showlineingray) print '</i>';
-				//else print '</a>';
-				print "</td>\n";
-
-				// Date start
-				print '<td align="center">';
-				print dol_print_date($lines[$i]->date_start,'dayhour');
-				print '</td>';
-
-				// Date end
-				print '<td align="center">';
-				$taskstatic->projectstatus = $lines[$i]->projectstatus;
-				$taskstatic->progress = $lines[$i]->progress;
-				$taskstatic->fk_statut = $lines[$i]->status;
-				$taskstatic->datee = $lines[$i]->date_end;
-				print dol_print_date($lines[$i]->date_end,'dayhour');
-				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;
-
-				// Planned Workload (in working hours)
-				print '<td align="right">';
-				$fullhour=convertSecondToTime($lines[$i]->planned_workload,$plannedworkloadoutputformat);
-				$workingdelay=convertSecondToTime($lines[$i]->planned_workload,'all',86400,7);	// TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
-				if ($lines[$i]->planned_workload != '')
-				{
-					print $fullhour;
-					// TODO Add delay taking account of working hours per day and working day per week
-					//if ($workingdelay != $fullhour) print '<br>('.$workingdelay.')';
-				}
-				//else print '--:--';
-				print '</td>';
-
-				// 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>';
-				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>';
-				}
-				print '</td>';
-
-				// Progress declared
-				print '<td align="right">';
-				if ($lines[$i]->progress != '')
-				{
-					print $lines[$i]->progress.' %';
-				}
-				print '</td>';
-
-				// Contacts of task
-				if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
-				{
-					print '<td>';
-					foreach(array('internal','external') as $source)
-					{
-						$tab = $lines[$i]->liste_contact(-1,$source);
-						$num=count($tab);
-						if (!empty($num)){
-							foreach ($tab as $contacttask){
-								//var_dump($contacttask);
-								if ($source == 'internal') $c = new User($db);
-								else $c = new Contact($db);
-								$c->fetch($contacttask['id']);
-								print $c->getNomUrl(1) . ' (' . $contacttask['libelle'] . ')' . '<br>';
-							}
-						}
-					}
-					print '</td>';
-				}
-
-				// Tick to drag and drop
-				if ($addordertick)
-				{
-					print '<td align="center" class="tdlineupdown hideonsmartphone">&nbsp;</td>';
-				}
-
-				print "</tr>\n";
-
-				if (! $showlineingray) $inc++;
-
-				if ($level >= 0)    // Call sublevels
-				{
-					$level++;
-					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;
-			}
-		}
-		else
-		{
-			//$level--;
-		}
-	}
-
-	if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0) && $level <= 0)
-	{
-		print '<tr class="liste_total nodrag nodrop">';
-		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
-		if ($showproject) print '<td></td><td></td>';
-		print '<td></td>';
-		print '<td></td>';
-		print '<td></td>';
-		print '<td align="right" class="nowrap liste_total">';
-		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').'">';
-		print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
-		if ($projectidfortotallink > 0) print '</a>';
-		print '</td>';
-		print '<td align="right" class="nowrap liste_total">';
-		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
-		print '</td>';
-		print '<td></td>';
-		// Contacts of task
-		if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
-		{
-			print '<td></td>';
-		}
-		if ($addordertick) print '<td class="hideonsmartphone"></td>';
-		print '</tr>';
-	}
-
-	return $inc;
+    global $user, $bc, $langs, $conf, $db;
+    global $projectstatic, $taskstatic;
+
+    $lastprojectid=0;
+
+    $projectsArrayId=explode(',',$projectsListId);
+    if ($filterprogresscalc!=='') {
+        foreach ($lines as $key=>$line) {
+            if (!empty($line->planned_workload) && !empty($line->duration)) {
+                $filterprogresscalc = str_replace(' = ', ' == ', $filterprogresscalc);
+                if (!eval($filterprogresscalc)) {
+                    unset($lines[$key]);
+                }
+            }
+        }
+        $lines=array_values($lines);
+    }
+
+    $numlines=count($lines);
+
+    // We declare counter as global because we want to edit them into recursive call
+    global $total_projectlinesa_spent,$total_projectlinesa_planned,$total_projectlinesa_spent_if_planned;
+    if ($level == 0)
+    {
+        $total_projectlinesa_spent=0;
+        $total_projectlinesa_planned=0;
+        $total_projectlinesa_spent_if_planned=0;
+    }
+
+    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
+
+        // 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
+        {
+            // Show task line.
+            $showline=1;
+            $showlineingray=0;
+
+            // If there is filters to use
+            if (is_array($taskrole))
+            {
+                // If task not legitimate to show, search if a legitimate task exists later in tree
+                if (! isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent)
+                {
+                    // So search if task has a subtask legitimate to show
+                    $foundtaskforuserdeeper=0;
+                    searchTaskInChild($foundtaskforuserdeeper,$lines[$i]->id,$lines,$taskrole);
+                    //print '$foundtaskforuserpeeper='.$foundtaskforuserdeeper.'<br>';
+                    if ($foundtaskforuserdeeper > 0)
+                    {
+                        $showlineingray=1;		// We will show line but in gray
+                    }
+                    else
+                    {
+                        $showline=0;			// No reason to show line
+                    }
+                }
+            }
+            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).
+                if (empty($user->rights->projet->all->lire))
+                {
+                    // User is not allowed on this project and project is not public, so we hide line
+                    if (! in_array($lines[$i]->fk_project, $projectsArrayId))
+                    {
+                        // Note that having a user assigned to a task into a project user has no permission on, should not be possible
+                        // because assignement on task can be done only on contact of project.
+                        // If assignement was done and after, was removed from contact of project, then we can hide the line.
+                        $showline=0;
+                    }
+                }
+            }
+
+            if ($showline)
+            {
+                // Break on a new project
+                if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
+                {
+                    $var = !$var;
+                    $lastprojectid=$lines[$i]->fk_project;
+                }
+
+                print '<tr '.$bc[$var].' id="row-'.$lines[$i]->id.'">'."\n";
+
+                if ($showproject)
+                {
+                    // Project ref
+                    print "<td>";
+                    //if ($showlineingray) print '<i>';
+                    $projectstatic->id=$lines[$i]->fk_project;
+                    $projectstatic->ref=$lines[$i]->projectref;
+                    $projectstatic->public=$lines[$i]->public;
+                    $projectstatic->title=$lines[$i]->projectlabel;
+                    if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
+                    else print $projectstatic->getNomUrl(1,'nolink');
+                    //if ($showlineingray) print '</i>';
+                    print "</td>";
+
+                    // Project status
+                    print '<td>';
+                    $projectstatic->statut=$lines[$i]->projectstatus;
+                    print $projectstatic->getLibStatut(2);
+                    print "</td>";
+                }
+
+                // Ref of task
+                print '<td>';
+                if ($showlineingray)
+                {
+                    print '<i>'.img_object('','projecttask').' '.$lines[$i]->ref.'</i>';
+                }
+                else
+                {
+                    $taskstatic->id=$lines[$i]->id;
+                    $taskstatic->ref=$lines[$i]->ref;
+                    $taskstatic->label=($taskrole[$lines[$i]->id]?$langs->trans("YourRole").': '.$taskrole[$lines[$i]->id]:'');
+                    print $taskstatic->getNomUrl(1,'withproject');
+                }
+                print '</td>';
+
+                // Title of task
+                print "<td>";
+                if ($showlineingray) print '<i>';
+                //else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
+                for ($k = 0 ; $k < $level ; $k++)
+                {
+                    print "&nbsp; &nbsp; &nbsp;";
+                }
+                print $lines[$i]->label;
+                if ($showlineingray) print '</i>';
+                //else print '</a>';
+                print "</td>\n";
+
+                // Date start
+                print '<td align="center">';
+                print dol_print_date($lines[$i]->date_start,'dayhour');
+                print '</td>';
+
+                // Date end
+                print '<td align="center">';
+                $taskstatic->projectstatus = $lines[$i]->projectstatus;
+                $taskstatic->progress = $lines[$i]->progress;
+                $taskstatic->fk_statut = $lines[$i]->status;
+                $taskstatic->datee = $lines[$i]->date_end;
+                print dol_print_date($lines[$i]->date_end,'dayhour');
+                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;
+
+                // Planned Workload (in working hours)
+                print '<td align="right">';
+                $fullhour=convertSecondToTime($lines[$i]->planned_workload,$plannedworkloadoutputformat);
+                $workingdelay=convertSecondToTime($lines[$i]->planned_workload,'all',86400,7);	// TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
+                if ($lines[$i]->planned_workload != '')
+                {
+                    print $fullhour;
+                    // TODO Add delay taking account of working hours per day and working day per week
+                    //if ($workingdelay != $fullhour) print '<br>('.$workingdelay.')';
+                }
+                //else print '--:--';
+                print '</td>';
+
+                // 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>';
+                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>';
+                }
+                print '</td>';
+
+                // Progress declared
+                print '<td align="right">';
+                if ($lines[$i]->progress != '')
+                {
+                    print $lines[$i]->progress.' %';
+                }
+                print '</td>';
+
+                // Contacts of task
+                if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
+                {
+                    print '<td>';
+                    foreach(array('internal','external') as $source)
+                    {
+                        $tab = $lines[$i]->liste_contact(-1,$source);
+                        $num=count($tab);
+                        if (!empty($num)){
+                            foreach ($tab as $contacttask){
+                                //var_dump($contacttask);
+                                if ($source == 'internal') $c = new User($db);
+                                else $c = new Contact($db);
+                                $c->fetch($contacttask['id']);
+                                print $c->getNomUrl(1) . ' (' . $contacttask['libelle'] . ')' . '<br>';
+                            }
+                        }
+                    }
+                    print '</td>';
+                }
+
+                // Tick to drag and drop
+                if ($addordertick)
+                {
+                    print '<td align="center" class="tdlineupdown hideonsmartphone">&nbsp;</td>';
+                }
+
+                print "</tr>\n";
+
+                if (! $showlineingray) $inc++;
+
+                if ($level >= 0)    // Call sublevels
+                {
+                    $level++;
+                    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;
+            }
+        }
+        else
+        {
+            //$level--;
+        }
+    }
+
+    if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0) && $level <= 0)
+    {
+        print '<tr class="liste_total nodrag nodrop">';
+        print '<td class="liste_total">'.$langs->trans("Total").'</td>';
+        if ($showproject) print '<td></td><td></td>';
+        print '<td></td>';
+        print '<td></td>';
+        print '<td></td>';
+        print '<td align="right" class="nowrap liste_total">';
+        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').'">';
+        print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
+        if ($projectidfortotallink > 0) print '</a>';
+        print '</td>';
+        print '<td align="right" class="nowrap liste_total">';
+        if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
+        print '</td>';
+        print '<td></td>';
+        // Contacts of task
+        if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
+        {
+            print '<td></td>';
+        }
+        if ($addordertick) print '<td class="hideonsmartphone"></td>';
+        print '</tr>';
+    }
+
+    return $inc;
 }
 
 
@@ -649,191 +649,191 @@ 
  */
 function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak=0)
 {
-	global $conf, $db, $user, $bc, $langs;
-	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
-
-	$lastprojectid=0;
-	$totalforeachline=array();
-	$workloadforid=array();
-	$lineswithoutlevel0=array();
-
-	$numlines=count($lines);
-
-	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
-	{
-		for ($i = 0 ; $i < $numlines ; $i++)
-		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
-		}
-	}
-
-	if (empty($oldprojectforbreak))
-	{
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
-	}
-
-	//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 ($lines[$i]->fk_task_parent == $parent)
-		//{
-			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
-			{
-				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
-
-				// Break on a new project
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-				{
-					$lastprojectid=$lines[$i]->fk_project;
-					if ($preselectedday)
-					{
-						$projectstatic->id = $lines[$i]->fk_project;
-					}
-				}
-
-				if (empty($workloadforid[$projectstatic->id]))
-				{
-					if ($preselectedday)
-					{
-						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-						$workloadforid[$projectstatic->id]=1;
-					}
-				}
-
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->project_ref;
-				$projectstatic->title=$lines[$i]->project_label;
-				$projectstatic->public=$lines[$i]->public;
-
-				$taskstatic->id=$lines[$i]->task_id;
-				$taskstatic->ref=($lines[$i]->task_ref?$lines[$i]->task_ref:$lines[$i]->task_id);
-				$taskstatic->label=$lines[$i]->task_label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
-
-				$thirdpartystatic->id=$lines[$i]->socid;
-				$thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				$thirdpartystatic->email=$lines[$i]->thirdparty_email;
-
-				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
-				{
-					print '<tr class="oddeven trforbreak">'."\n";
-					print '<td colspan="11">';
-					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
-					if ($projectstatic->title)
-					{
-						print ' - ';
-						print $projectstatic->title;
-					}
-					print '</td>';
-					print '</tr>';
-				}
-
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
-
-				print '<tr class="oddeven">'."\n";
-
-				// User
-				/*
+    global $conf, $db, $user, $bc, $langs;
+    global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
+
+    $lastprojectid=0;
+    $totalforeachline=array();
+    $workloadforid=array();
+    $lineswithoutlevel0=array();
+
+    $numlines=count($lines);
+
+    // Create a smaller array with sublevels only to be used later. This increase dramatically performances.
+    if ($parent == 0) // Always and only if at first level
+    {
+        for ($i = 0 ; $i < $numlines ; $i++)
+        {
+            if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+        }
+    }
+
+    if (empty($oldprojectforbreak))
+    {
+        $oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
+    }
+
+    //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 ($lines[$i]->fk_task_parent == $parent)
+        //{
+            // If we want all or we have a role on task, we show it
+            if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+            {
+                //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
+
+                // Break on a new project
+                if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
+                {
+                    $lastprojectid=$lines[$i]->fk_project;
+                    if ($preselectedday)
+                    {
+                        $projectstatic->id = $lines[$i]->fk_project;
+                    }
+                }
+
+                if (empty($workloadforid[$projectstatic->id]))
+                {
+                    if ($preselectedday)
+                    {
+                        $projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+                        $workloadforid[$projectstatic->id]=1;
+                    }
+                }
+
+                $projectstatic->id=$lines[$i]->fk_project;
+                $projectstatic->ref=$lines[$i]->project_ref;
+                $projectstatic->title=$lines[$i]->project_label;
+                $projectstatic->public=$lines[$i]->public;
+
+                $taskstatic->id=$lines[$i]->task_id;
+                $taskstatic->ref=($lines[$i]->task_ref?$lines[$i]->task_ref:$lines[$i]->task_id);
+                $taskstatic->label=$lines[$i]->task_label;
+                $taskstatic->date_start=$lines[$i]->date_start;
+                $taskstatic->date_end=$lines[$i]->date_end;
+
+                $thirdpartystatic->id=$lines[$i]->socid;
+                $thirdpartystatic->name=$lines[$i]->thirdparty_name;
+                $thirdpartystatic->email=$lines[$i]->thirdparty_email;
+
+                if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
+                {
+                    print '<tr class="oddeven trforbreak">'."\n";
+                    print '<td colspan="11">';
+                    print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+                    if ($projectstatic->title)
+                    {
+                        print ' - ';
+                        print $projectstatic->title;
+                    }
+                    print '</td>';
+                    print '</tr>';
+                }
+
+                if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+
+                print '<tr class="oddeven">'."\n";
+
+                // User
+                /*
 				 print '<td class="nowrap">';
 				 print $fuser->getNomUrl(1, 'withproject', 'time');
 				 print '</td>';
 				 */
 
-				// Project
-				print "<td>";
-				if ($oldprojectforbreak == -1)
-				{
-					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
-					print '<br>'.$projectstatic->title;
-				}
-				print "</td>";
-
-				// Thirdparty
-				print '<td class="tdoverflowmax100">';
-				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;";
-				print $taskstatic->getNomUrl(1, 'withproject', 'time');
-				// Label task
-				print '<br>';
-				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;";
-				//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
-				print "</td>\n";
-
-				// Date
-				print '<td align="center">';
-				print dol_print_date($lines[$i]->timespent_datehour,'day');
-				print '</td>';
-
-				$disabledproject=1;$disabledtask=1;
-				//print "x".$lines[$i]->fk_project;
-				//var_dump($lines[$i]);
-				//var_dump($projectsrole[$lines[$i]->fk_project]);
-				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
-				{
-					$disabledproject=0;
-					$disabledtask=0;
-				}
-				// If $restricteditformytask is on and I have no role on task, i disable edit
-				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
-				{
-					$disabledtask=1;
-				}
-
-				// Hour
-				print '<td class="nowrap" align="center">';
-				print dol_print_date($lines[$i]->timespent_datehour,'hour');
-				print '</td>';
-
-				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
-
-				// Duration
-				print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
-
-				$dayWorkLoad = $lines[$i]->timespent_duration;
-				$totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
-
-				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
-
-				print convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
-
-				$modeinput='hours';
-
-				print '<script type="text/javascript">';
-				print "jQuery(document).ready(function () {\n";
-				print " 	jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";
-				print "})\n";
-				print '</script>';
-
-				print '</td>';
-
-				// Note
-				print '<td align="center">';
-				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
-				print $lines[$i]->timespent_note;
-				print '</textarea>';
-				print '</td>';
-
-				// Warning
-				print '<td align="right">';
-				/*if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+                // Project
+                print "<td>";
+                if ($oldprojectforbreak == -1)
+                {
+                    print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+                    print '<br>'.$projectstatic->title;
+                }
+                print "</td>";
+
+                // Thirdparty
+                print '<td class="tdoverflowmax100">';
+                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;";
+                print $taskstatic->getNomUrl(1, 'withproject', 'time');
+                // Label task
+                print '<br>';
+                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;";
+                //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
+                print "</td>\n";
+
+                // Date
+                print '<td align="center">';
+                print dol_print_date($lines[$i]->timespent_datehour,'day');
+                print '</td>';
+
+                $disabledproject=1;$disabledtask=1;
+                //print "x".$lines[$i]->fk_project;
+                //var_dump($lines[$i]);
+                //var_dump($projectsrole[$lines[$i]->fk_project]);
+                // If at least one role for project
+                if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+                {
+                    $disabledproject=0;
+                    $disabledtask=0;
+                }
+                // If $restricteditformytask is on and I have no role on task, i disable edit
+                if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
+                {
+                    $disabledtask=1;
+                }
+
+                // Hour
+                print '<td class="nowrap" align="center">';
+                print dol_print_date($lines[$i]->timespent_datehour,'hour');
+                print '</td>';
+
+                $cssonholiday='';
+                if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
+                elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
+                elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+
+                // Duration
+                print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
+
+                $dayWorkLoad = $lines[$i]->timespent_duration;
+                $totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
+
+                $alreadyspent='';
+                if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+
+                print convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+
+                $modeinput='hours';
+
+                print '<script type="text/javascript">';
+                print "jQuery(document).ready(function () {\n";
+                print " 	jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";
+                print "})\n";
+                print '</script>';
+
+                print '</td>';
+
+                // Note
+                print '<td align="center">';
+                print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
+                print $lines[$i]->timespent_note;
+                print '</textarea>';
+                print '</td>';
+
+                // Warning
+                print '<td align="right">';
+                /*if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
 				else if ($disabledtask)
 				{
 					$titleassigntask = $langs->trans("AssignTaskToMe");
@@ -841,18 +841,18 @@ 
 
 					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
 				}*/
-				print '</td>';
-
-				print "</tr>\n";
-			}
-		//}
-		//else
-		//{
-			//$level--;
-		//}
-	}
-
-	return $totalforeachline;
+                print '</td>';
+
+                print "</tr>\n";
+            }
+        //}
+        //else
+        //{
+            //$level--;
+        //}
+    }
+
+    return $totalforeachline;
 }
 
 
@@ -875,273 +875,273 @@ 
  */
 function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak=0)
 {
-	global $conf, $db, $user, $bc, $langs;
-	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
-
-	$lastprojectid=0;
-	$totalforeachday=array();
-	$workloadforid=array();
-	$lineswithoutlevel0=array();
-
-	$numlines=count($lines);
-
-	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
-	{
-		for ($i = 0 ; $i < $numlines ; $i++)
-		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
-		}
-	}
-
-	if (empty($oldprojectforbreak))
-	{
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
-	}
-
-	//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 ($lines[$i]->fk_task_parent == $parent)
-		{
-			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
-			{
-				//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
-				{
-					continue;
-				}
-
-				// Break on a new project
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-				{
-					$lastprojectid=$lines[$i]->fk_project;
-					if ($preselectedday)
-					{
-						$projectstatic->id = $lines[$i]->fk_project;
-					}
-				}
-
-				if (empty($workloadforid[$projectstatic->id]))
-				{
-					if ($preselectedday)
-					{
-						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-		   				$workloadforid[$projectstatic->id]=1;
-					}
-				}
-
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->projectref;
-				$projectstatic->title=$lines[$i]->projectlabel;
-				$projectstatic->public=$lines[$i]->public;
-
-				$taskstatic->id=$lines[$i]->id;
-				$taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
-				$taskstatic->label=$lines[$i]->label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
-
-				$thirdpartystatic->id=$lines[$i]->socid;
-				$thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				$thirdpartystatic->email=$lines[$i]->thirdparty_email;
-
-				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
-				{
-					print '<tr class="oddeven trforbreak">'."\n";
-					print '<td colspan="9">';
-					print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
-					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
-					if ($projectstatic->title)
-					{
-						print ' - ';
-						print $projectstatic->title;
-					}
-					print '</td>';
-					print '</tr>';
-				}
-
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
-
-				print '<tr class="oddeven">'."\n";
-
-				// User
-				/*
+    global $conf, $db, $user, $bc, $langs;
+    global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
+
+    $lastprojectid=0;
+    $totalforeachday=array();
+    $workloadforid=array();
+    $lineswithoutlevel0=array();
+
+    $numlines=count($lines);
+
+    // Create a smaller array with sublevels only to be used later. This increase dramatically performances.
+    if ($parent == 0) // Always and only if at first level
+    {
+        for ($i = 0 ; $i < $numlines ; $i++)
+        {
+            if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+        }
+    }
+
+    if (empty($oldprojectforbreak))
+    {
+        $oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
+    }
+
+    //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 ($lines[$i]->fk_task_parent == $parent)
+        {
+            // If we want all or we have a role on task, we show it
+            if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+            {
+                //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
+                {
+                    continue;
+                }
+
+                // Break on a new project
+                if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
+                {
+                    $lastprojectid=$lines[$i]->fk_project;
+                    if ($preselectedday)
+                    {
+                        $projectstatic->id = $lines[$i]->fk_project;
+                    }
+                }
+
+                if (empty($workloadforid[$projectstatic->id]))
+                {
+                    if ($preselectedday)
+                    {
+                        $projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+                            $workloadforid[$projectstatic->id]=1;
+                    }
+                }
+
+                $projectstatic->id=$lines[$i]->fk_project;
+                $projectstatic->ref=$lines[$i]->projectref;
+                $projectstatic->title=$lines[$i]->projectlabel;
+                $projectstatic->public=$lines[$i]->public;
+
+                $taskstatic->id=$lines[$i]->id;
+                $taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
+                $taskstatic->label=$lines[$i]->label;
+                $taskstatic->date_start=$lines[$i]->date_start;
+                $taskstatic->date_end=$lines[$i]->date_end;
+
+                $thirdpartystatic->id=$lines[$i]->socid;
+                $thirdpartystatic->name=$lines[$i]->thirdparty_name;
+                $thirdpartystatic->email=$lines[$i]->thirdparty_email;
+
+                if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
+                {
+                    print '<tr class="oddeven trforbreak">'."\n";
+                    print '<td colspan="9">';
+                    print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
+                    if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
+                    if ($projectstatic->title)
+                    {
+                        print ' - ';
+                        print $projectstatic->title;
+                    }
+                    print '</td>';
+                    print '</tr>';
+                }
+
+                if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+
+                print '<tr class="oddeven">'."\n";
+
+                // User
+                /*
 				print '<td class="nowrap">';
 				print $fuser->getNomUrl(1, 'withproject', 'time');
 				print '</td>';
 				*/
 
-				// Project
-				/*print "<td>";
+                // Project
+                /*print "<td>";
 				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 				print "</td>";*/
 
-				// Thirdparty
-				/*print '<td class="tdoverflowmax100">';
+                // Thirdparty
+                /*print '<td class="tdoverflowmax100">';
 				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;";
-				print $taskstatic->getNomUrl(1, 'withproject', 'time');
-				// Label task
-				print '<br>';
-				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;";
-				//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
-				print "</td>\n";
-
-				// Planned Workload
-				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
-				else print '--:--';
-				print '</td>';
-
-				// Progress declared %
-				print '<td align="right">';
-				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
-				print '</td>';
-
-				// Time spent by everybody
-				print '<td align="right">';
-				// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
-				if ($lines[$i]->duration)
-				{
-					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
-					print convertSecondToTime($lines[$i]->duration,'allhourmin');
-					print '</a>';
-				}
-				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 '--:--';
-				print "</td>\n";
-
-				$disabledproject=1;$disabledtask=1;
-				//print "x".$lines[$i]->fk_project;
-				//var_dump($lines[$i]);
-				//var_dump($projectsrole[$lines[$i]->fk_project]);
-				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
-				{
-					$disabledproject=0;
-					$disabledtask=0;
-				}
-				// If $restricteditformytask is on and I have no role on task, i disable edit
-				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
-				{
-					$disabledtask=1;
-				}
-
-				// Form to add new time
-				print '<td class="nowrap leftborder" align="center">';
-				$tableCell = $form->selectDate($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, $disabledtask);
-				print $tableCell;
-				print '</td>';
-
-				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
-
-				global $daytoparse;
-				$tmparray = dol_getdate($daytoparse,true);	// detail of current day
-				$idw = $tmparray['wday'];
-
-				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.
-				{
-					$cssweekend='weekend';
-				}
-
-				// Duration
-				print '<td class="center duration'.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
-				$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
-				$totalforeachday[$preselectedday]+=$dayWorkLoad;
-
-				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
-
-				$idw = 0;
-
-				$tableCell='';
-				$tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
-				$tableCell.='<span class="hideonsmartphone"> + </span>';
-				//$tableCell.='&nbsp;&nbsp;&nbsp;';
-				$tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1);
-				//$tableCell.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">';
-				print $tableCell;
-
-				$modeinput='hours';
-
-				print '<script type="text/javascript">';
-				print "jQuery(document).ready(function () {\n";
-				print " 	jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";
-				print "})\n";
-				print '</script>';
-
-				print '</td>';
-
-				// Note
-				print '<td align="center">';
-				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
-				print '</textarea>';
-				print '</td>';
-
-				// Warning
-				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
-   				else if ($disabledtask)
-   				{
-   					$titleassigntask = $langs->trans("AssignTaskToMe");
-   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
-
-   					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
-   				}
-				print '</td>';
-
-				print "</tr>\n";
-			}
-
-			$inc++;
-			$level++;
-			if ($lines[$i]->id > 0)
-			{
-				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
-				//var_dump($totalforeachday);
-				$ret = projectLinesPerDay($inc, $lines[$i]->id, $fuser, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable, $oldprojectforbreak);
-				//var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
-				//var_dump($ret);
-				foreach($ret as $key => $val)
-				{
-					$totalforeachday[$key]+=$val;
-				}
-				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
-				//var_dump($totalforeachday);
-			}
-			$level--;
-		}
-		else
-		{
-			//$level--;
-		}
-	}
-
-	return $totalforeachday;
+                // Ref
+                print '<td>';
+                print '<!-- Task id = '.$lines[$i]->id.' -->';
+                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;";
+                print $taskstatic->label;
+                //print "<br>";
+                //for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+                //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
+                print "</td>\n";
+
+                // Planned Workload
+                print '<td align="right" class="leftborder plannedworkload">';
+                if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+                else print '--:--';
+                print '</td>';
+
+                // Progress declared %
+                print '<td align="right">';
+                print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
+                print '</td>';
+
+                // Time spent by everybody
+                print '<td align="right">';
+                // $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
+                if ($lines[$i]->duration)
+                {
+                    print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
+                    print convertSecondToTime($lines[$i]->duration,'allhourmin');
+                    print '</a>';
+                }
+                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 '--:--';
+                print "</td>\n";
+
+                $disabledproject=1;$disabledtask=1;
+                //print "x".$lines[$i]->fk_project;
+                //var_dump($lines[$i]);
+                //var_dump($projectsrole[$lines[$i]->fk_project]);
+                // If at least one role for project
+                if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+                {
+                    $disabledproject=0;
+                    $disabledtask=0;
+                }
+                // If $restricteditformytask is on and I have no role on task, i disable edit
+                if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
+                {
+                    $disabledtask=1;
+                }
+
+                // Form to add new time
+                print '<td class="nowrap leftborder" align="center">';
+                $tableCell = $form->selectDate($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, $disabledtask);
+                print $tableCell;
+                print '</td>';
+
+                $cssonholiday='';
+                if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
+                elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
+                elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+
+                global $daytoparse;
+                $tmparray = dol_getdate($daytoparse,true);	// detail of current day
+                $idw = $tmparray['wday'];
+
+                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.
+                {
+                    $cssweekend='weekend';
+                }
+
+                // Duration
+                print '<td class="center duration'.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
+                $dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
+                $totalforeachday[$preselectedday]+=$dayWorkLoad;
+
+                $alreadyspent='';
+                if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+
+                $idw = 0;
+
+                $tableCell='';
+                $tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+                $tableCell.='<span class="hideonsmartphone"> + </span>';
+                //$tableCell.='&nbsp;&nbsp;&nbsp;';
+                $tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1);
+                //$tableCell.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">';
+                print $tableCell;
+
+                $modeinput='hours';
+
+                print '<script type="text/javascript">';
+                print "jQuery(document).ready(function () {\n";
+                print " 	jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";
+                print "})\n";
+                print '</script>';
+
+                print '</td>';
+
+                // Note
+                print '<td align="center">';
+                print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
+                print '</textarea>';
+                print '</td>';
+
+                // Warning
+                print '<td align="right">';
+                    if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+                    else if ($disabledtask)
+                    {
+                        $titleassigntask = $langs->trans("AssignTaskToMe");
+                        if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+
+                        print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+                    }
+                print '</td>';
+
+                print "</tr>\n";
+            }
+
+            $inc++;
+            $level++;
+            if ($lines[$i]->id > 0)
+            {
+                //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
+                //var_dump($totalforeachday);
+                $ret = projectLinesPerDay($inc, $lines[$i]->id, $fuser, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable, $oldprojectforbreak);
+                //var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
+                //var_dump($ret);
+                foreach($ret as $key => $val)
+                {
+                    $totalforeachday[$key]+=$val;
+                }
+                //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
+                //var_dump($totalforeachday);
+            }
+            $level--;
+        }
+        else
+        {
+            //$level--;
+        }
+    }
+
+    return $totalforeachday;
 }
 
 
@@ -1164,263 +1164,263 @@ 
  */
 function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak=0)
 {
-	global $conf, $db, $user, $bc, $langs;
-	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
-
-	$numlines=count($lines);
-
-	$lastprojectid=0;
-	$workloadforid=array();
-	$totalforeachday=array();
-	$lineswithoutlevel0=array();
-
-	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
-	{
-		for ($i = 0 ; $i < $numlines ; $i++)
-		{
-		   if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
-		}
-	}
-
-	//dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-
-	if (empty($oldprojectforbreak))
-	{
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 = start break, -1 = never break
-	}
-
-	for ($i = 0 ; $i < $numlines ; $i++)
-	{
-		if ($parent == 0) $level = 0;
-
-		if ($lines[$i]->fk_task_parent == $parent)
-		{
-			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
-			{
-				//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
-				{
-					continue;
-				}
-
-				// Break on a new project
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-				{
-					$lastprojectid=$lines[$i]->fk_project;
-					$projectstatic->id = $lines[$i]->fk_project;
-				}
-
-				//var_dump('--- '.$level.' '.$firstdaytoshow.' '.$fuser->id.' '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
-				//var_dump($projectstatic->weekWorkLoadPerTask);
-				if (empty($workloadforid[$projectstatic->id]))
-				{
-					$projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-					$workloadforid[$projectstatic->id]=1;
-				}
-				//var_dump($projectstatic->weekWorkLoadPerTask);
-				//var_dump('--- '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
-
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->projectref;
-				$projectstatic->title=$lines[$i]->projectlabel;
-				$projectstatic->public=$lines[$i]->public;
-				$projectstatic->thirdparty_name=$lines[$i]->thirdparty_name;
-
-				$taskstatic->id=$lines[$i]->id;
-				$taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
-				$taskstatic->label=$lines[$i]->label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
-
-				$thirdpartystatic->id=$lines[$i]->thirdparty_id;
-				$thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				$thirdpartystatic->email=$lines[$i]->thirdparty_email;
-
-				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
-				{
-					print '<tr class="oddeven trforbreak">'."\n";
-					print '<td colspan="13">';
-					print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
-					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
-					if ($projectstatic->title)
-					{
-						print ' - ';
-						print $projectstatic->title;
-					}
-					print '</td>';
-					print '</tr>';
-				}
-
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
-
-				print '<tr class="oddeven">'."\n";
-
-				// User
-				/*
+    global $conf, $db, $user, $bc, $langs;
+    global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
+
+    $numlines=count($lines);
+
+    $lastprojectid=0;
+    $workloadforid=array();
+    $totalforeachday=array();
+    $lineswithoutlevel0=array();
+
+    // Create a smaller array with sublevels only to be used later. This increase dramatically performances.
+    if ($parent == 0) // Always and only if at first level
+    {
+        for ($i = 0 ; $i < $numlines ; $i++)
+        {
+            if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+        }
+    }
+
+    //dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
+
+    if (empty($oldprojectforbreak))
+    {
+        $oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 = start break, -1 = never break
+    }
+
+    for ($i = 0 ; $i < $numlines ; $i++)
+    {
+        if ($parent == 0) $level = 0;
+
+        if ($lines[$i]->fk_task_parent == $parent)
+        {
+            // If we want all or we have a role on task, we show it
+            if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+            {
+                //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
+                {
+                    continue;
+                }
+
+                // Break on a new project
+                if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
+                {
+                    $lastprojectid=$lines[$i]->fk_project;
+                    $projectstatic->id = $lines[$i]->fk_project;
+                }
+
+                //var_dump('--- '.$level.' '.$firstdaytoshow.' '.$fuser->id.' '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
+                //var_dump($projectstatic->weekWorkLoadPerTask);
+                if (empty($workloadforid[$projectstatic->id]))
+                {
+                    $projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+                    $workloadforid[$projectstatic->id]=1;
+                }
+                //var_dump($projectstatic->weekWorkLoadPerTask);
+                //var_dump('--- '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
+
+                $projectstatic->id=$lines[$i]->fk_project;
+                $projectstatic->ref=$lines[$i]->projectref;
+                $projectstatic->title=$lines[$i]->projectlabel;
+                $projectstatic->public=$lines[$i]->public;
+                $projectstatic->thirdparty_name=$lines[$i]->thirdparty_name;
+
+                $taskstatic->id=$lines[$i]->id;
+                $taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
+                $taskstatic->label=$lines[$i]->label;
+                $taskstatic->date_start=$lines[$i]->date_start;
+                $taskstatic->date_end=$lines[$i]->date_end;
+
+                $thirdpartystatic->id=$lines[$i]->thirdparty_id;
+                $thirdpartystatic->name=$lines[$i]->thirdparty_name;
+                $thirdpartystatic->email=$lines[$i]->thirdparty_email;
+
+                if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
+                {
+                    print '<tr class="oddeven trforbreak">'."\n";
+                    print '<td colspan="13">';
+                    print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
+                    if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
+                    if ($projectstatic->title)
+                    {
+                        print ' - ';
+                        print $projectstatic->title;
+                    }
+                    print '</td>';
+                    print '</tr>';
+                }
+
+                if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+
+                print '<tr class="oddeven">'."\n";
+
+                // User
+                /*
 				print '<td class="nowrap">';
 				print $fuser->getNomUrl(1, 'withproject', 'time');
 				print '</td>';
 				*/
 
-				// Project
-				/*print '<td class="nowrap">';
+                // Project
+                /*print '<td class="nowrap">';
 				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 				print "</td>";*/
 
-				// Thirdparty
-				/*print '<td class="tdoverflowmax100">';
+                // Thirdparty
+                /*print '<td class="tdoverflowmax100">';
 				if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project');
 				print '</td>';*/
 
-				// Ref
-				print '<td class="nowrap">';
-				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				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;";
-				//print $taskstatic->getNomUrl(0, 'withproject', 'time');
-				print $taskstatic->label;
-				//print "<br>";
-				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
-				print "</td>\n";
-
-				// Planned Workload
-				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
-				else print '--:--';
-				print '</td>';
-
-				// Progress declared %
-				print '<td align="right">';
-				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
-				print '</td>';
-
-				// Time spent by everybody
-				print '<td align="right">';
-				// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
-				if ($lines[$i]->duration)
-				{
-					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
-					print convertSecondToTime($lines[$i]->duration,'allhourmin');
-					print '</a>';
-				}
-				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 '--:--';
-				print "</td>\n";
-
-				$disabledproject=1;$disabledtask=1;
-				//print "x".$lines[$i]->fk_project;
-				//var_dump($lines[$i]);
-				//var_dump($projectsrole[$lines[$i]->fk_project]);
-				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
-				{
-					$disabledproject=0;
-					$disabledtask=0;
-				}
-				// If $restricteditformytask is on and I have no role on task, i disable edit
-				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
-				{
-					$disabledtask=1;
-				}
-
-				//var_dump($projectstatic->weekWorkLoadPerTask);
-
-				// Fields to show current time
-				$tableCell=''; $modeinput='hours';
-				for ($idw = 0; $idw < 7; $idw++)
-				{
-					$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 ';
-
-					$tmparray=dol_getdate($tmpday);
-					$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
-					$totalforeachday[$tmpday]+=$dayWorkLoad;
-
-					$alreadyspent='';
-					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.
-					{
-						$cssweekend='weekend';
-					}
-
-					$tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
-					$placeholder='';
-					if ($alreadyspent)
-					{
-						$tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
-						//$placeholder=' placeholder="00:00"';
-					 	//$tableCell.='+';
-					}
-				  	$tableCell.='<input type="text" alt="'.($disabledtask?'':$alttitle).'" title="'.($disabledtask?'':$alttitle).'" '.($disabledtask?'disabled':$placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
-					$tableCell.=' onkeypress="return regexEvent(this,event,\'timeChar\')"';
-				   	$tableCell.=' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
-				   	$tableCell.=' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
-				   	$tableCell.='</td>';
-					print $tableCell;
-				}
-
-				// Warning
-				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
-   				else if ($disabledtask)
-   				{
-   					$titleassigntask = $langs->trans("AssignTaskToMe");
-   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
-
-   					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
-   				}
-				print '</td>';
-
-				print "</tr>\n";
-			}
-
-			// Call to show task with a lower level (task under the current task)
-			$inc++;
-			$level++;
-			if ($lines[$i]->id > 0)
-			{
-				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
-				//var_dump($totalforeachday);
-				$ret = projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak);
-				//var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
-				//var_dump($ret);
-				foreach($ret as $key => $val)
-				{
-					$totalforeachday[$key]+=$val;
-				}
-				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
-				//var_dump($totalforeachday);
-			}
-			$level--;
-		}
-		else
-		{
-			//$level--;
-		}
-	}
-
-	return $totalforeachday;
+                // Ref
+                print '<td class="nowrap">';
+                print '<!-- Task id = '.$lines[$i]->id.' -->';
+                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;";
+                //print $taskstatic->getNomUrl(0, 'withproject', 'time');
+                print $taskstatic->label;
+                //print "<br>";
+                //for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+                //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
+                print "</td>\n";
+
+                // Planned Workload
+                print '<td align="right" class="leftborder plannedworkload">';
+                if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+                else print '--:--';
+                print '</td>';
+
+                // Progress declared %
+                print '<td align="right">';
+                print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
+                print '</td>';
+
+                // Time spent by everybody
+                print '<td align="right">';
+                // $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
+                if ($lines[$i]->duration)
+                {
+                    print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
+                    print convertSecondToTime($lines[$i]->duration,'allhourmin');
+                    print '</a>';
+                }
+                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 '--:--';
+                print "</td>\n";
+
+                $disabledproject=1;$disabledtask=1;
+                //print "x".$lines[$i]->fk_project;
+                //var_dump($lines[$i]);
+                //var_dump($projectsrole[$lines[$i]->fk_project]);
+                // If at least one role for project
+                if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+                {
+                    $disabledproject=0;
+                    $disabledtask=0;
+                }
+                // If $restricteditformytask is on and I have no role on task, i disable edit
+                if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
+                {
+                    $disabledtask=1;
+                }
+
+                //var_dump($projectstatic->weekWorkLoadPerTask);
+
+                // Fields to show current time
+                $tableCell=''; $modeinput='hours';
+                for ($idw = 0; $idw < 7; $idw++)
+                {
+                    $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 ';
+
+                    $tmparray=dol_getdate($tmpday);
+                    $dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
+                    $totalforeachday[$tmpday]+=$dayWorkLoad;
+
+                    $alreadyspent='';
+                    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.
+                    {
+                        $cssweekend='weekend';
+                    }
+
+                    $tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
+                    $placeholder='';
+                    if ($alreadyspent)
+                    {
+                        $tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+                        //$placeholder=' placeholder="00:00"';
+                            //$tableCell.='+';
+                    }
+                        $tableCell.='<input type="text" alt="'.($disabledtask?'':$alttitle).'" title="'.($disabledtask?'':$alttitle).'" '.($disabledtask?'disabled':$placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
+                    $tableCell.=' onkeypress="return regexEvent(this,event,\'timeChar\')"';
+                        $tableCell.=' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
+                        $tableCell.=' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
+                        $tableCell.='</td>';
+                    print $tableCell;
+                }
+
+                // Warning
+                print '<td align="right">';
+                    if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+                    else if ($disabledtask)
+                    {
+                        $titleassigntask = $langs->trans("AssignTaskToMe");
+                        if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+
+                        print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+                    }
+                print '</td>';
+
+                print "</tr>\n";
+            }
+
+            // Call to show task with a lower level (task under the current task)
+            $inc++;
+            $level++;
+            if ($lines[$i]->id > 0)
+            {
+                //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
+                //var_dump($totalforeachday);
+                $ret = projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak);
+                //var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
+                //var_dump($ret);
+                foreach($ret as $key => $val)
+                {
+                    $totalforeachday[$key]+=$val;
+                }
+                //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
+                //var_dump($totalforeachday);
+            }
+            $level--;
+        }
+        else
+        {
+            //$level--;
+        }
+    }
+
+    return $totalforeachday;
 }
 
 
@@ -1435,29 +1435,29 @@ 
  */
 function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
 {
-	//print 'Search in line with parent id = '.$parent.'<br>';
-	$numlines=count($lines);
-	for ($i = 0 ; $i < $numlines ; $i++)
-	{
-		// Process line $lines[$i]
-		if ($lines[$i]->fk_parent == $parent && $lines[$i]->id != $lines[$i]->fk_parent)
-		{
-			// If task is legitimate to show, no more need to search deeper
-			if (isset($taskrole[$lines[$i]->id]))
-			{
-				//print 'Found a legitimate task id='.$lines[$i]->id.'<br>';
-				$inc++;
-				return $inc;
-			}
-
-			searchTaskInChild($inc, $lines[$i]->id, $lines, $taskrole);
-			//print 'Found inc='.$inc.'<br>';
-
-			if ($inc > 0) return $inc;
-		}
-	}
-
-	return $inc;
+    //print 'Search in line with parent id = '.$parent.'<br>';
+    $numlines=count($lines);
+    for ($i = 0 ; $i < $numlines ; $i++)
+    {
+        // Process line $lines[$i]
+        if ($lines[$i]->fk_parent == $parent && $lines[$i]->id != $lines[$i]->fk_parent)
+        {
+            // If task is legitimate to show, no more need to search deeper
+            if (isset($taskrole[$lines[$i]->id]))
+            {
+                //print 'Found a legitimate task id='.$lines[$i]->id.'<br>';
+                $inc++;
+                return $inc;
+            }
+
+            searchTaskInChild($inc, $lines[$i]->id, $lines, $taskrole);
+            //print 'Found inc='.$inc.'<br>';
+
+            if ($inc > 0) return $inc;
+        }
+    }
+
+    return $inc;
 }
 
 /**
@@ -1475,235 +1475,235 @@ 
  */
 function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=0, $statut=-1, $listofoppstatus=array(),$hiddenfields=array())
 {
-	global $langs,$conf,$user,$bc;
-
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-	$projectstatic=new Project($db);
-	$thirdpartystatic=new Societe($db);
-
-	$sortfield='';
-	$sortorder='';
-	$project_year_filter=0;
-
-	$title=$langs->trans("Projects");
-	if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
-
-	$arrayidtypeofcontact=array();
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder" width="100%">';
-
-	$sql= " FROM ".MAIN_DB_PREFIX."projet as p";
-	if ($mytasks)
-	{
-		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-		$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
-		$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
-	}
-	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 ($mytasks)
-	{
-		$sql.= " AND p.rowid = t.fk_projet";
-		$sql.= " AND ec.element_id = t.rowid";
-		$sql.= " AND ec.fk_socpeople = ".$user->id;
-		$sql.= " AND ec.fk_c_type_contact = ctc.rowid";   // Replace the 2 lines with ec.fk_c_type_contact in $arrayidtypeofcontact
-		$sql.= " AND ctc.element = 'project_task'";
-	}
-	if ($statut >= 0)
-	{
-		$sql.= " AND p.fk_statut = ".$statut;
-	}
-	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
-	{
-		$project_year_filter = GETPOST("project_year_filter");
-		//Check if empty or invalid year. Wildcard ignores the sql check
-		if ($project_year_filter != "*")
-		{
-			if (empty($project_year_filter) || !ctype_digit($project_year_filter))
-			{
-				$project_year_filter = date("Y");
-			}
-			$sql.= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter,12,false)).")";
-			$sql.= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter,1,false)).")";
-		}
-	}
-
-	// Get id of project we must show tasks
-	$arrayidofprojects=array();
-	$sql1 = "SELECT p.rowid as projectid";
-	$sql1.= $sql;
-	$resql = $db->query($sql1);
-	if ($resql)
-	{
-		$i=0;
-		$num = $db->num_rows($resql);
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-			$arrayidofprojects[$objp->projectid]=$objp->projectid;
-			$i++;
-		}
-	}
-	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,";
-	$sql2.= " p.dateo, p.datee,";
-	$sql2.= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
-	$sql2.= " FROM ".MAIN_DB_PREFIX."projet as p";
-	$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
-	$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
-	$sql2.= " WHERE p.rowid IN (".join(',',$arrayidofprojects).")";
-	$sql2.= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.nom, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_amount, p.dateo, p.datee";
-	$sql2.= " ORDER BY p.title, p.ref";
-
-	$resql = $db->query($sql2);
-	if ($resql)
-	{
-	   $total_task = 0;
-		$total_opp_amount = 0;
-		$ponderated_opp_amount = 0;
-
-		$num = $db->num_rows($resql);
-		$i = 0;
-
-		print '<tr class="liste_titre">';
-		print_liste_field_titre($title.' <span class="badge">'.$num.'</span>',$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-		print_liste_field_titre("ThirdParty",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
-			print_liste_field_titre("OpportunityAmount","","","","",'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre("OpportunityStatus","","","","",'align="right"',$sortfield,$sortorder);
-		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS))
-		{
-			print_liste_field_titre("Tasks","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
-		}
-		print_liste_field_titre("Status","","","","",'align="right"',$sortfield,$sortorder);
-		print "</tr>\n";
-
-		$total_plannedworkload=0;
-		$total_declaredprogressworkload=0;
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-
-			$projectstatic->id = $objp->projectid;
-			$projectstatic->user_author_id = $objp->fk_user_creat;
-			$projectstatic->public = $objp->public;
-
-			// Check is user has read permission on project
-			$userAccess = $projectstatic->restrictedProjectArea($user);
-			if ($userAccess >= 0)
-			{
-				$projectstatic->ref=$objp->ref;
-				$projectstatic->statut = $objp->status;
-				$projectstatic->title = $objp->title;
-				$projectstatic->datee = $db->jdate($objp->datee);
-				$projectstatic->dateo = $db->jdate($objp->dateo);
-
-
-				print '<tr class="oddeven">';
-				print '<td>';
-				print $projectstatic->getNomUrl(1);
-				if (! in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title,24);
-				print '</td>';
-				print '<td>';
-				if ($objp->fk_soc > 0)
-				{
-					$thirdpartystatic->id=$objp->fk_soc;
-					$thirdpartystatic->ref=$objp->socname;
-					$thirdpartystatic->name=$objp->socname;
-					print $thirdpartystatic->getNomUrl(1);
-				}
-				print '</td>';
-				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);
-					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);
-					print '</td>';
-				}
-				if (empty($conf->global->PROJECT_HIDE_TASKS))
-				{
-					print '<td align="right">'.$objp->nb.'</td>';
-
-					$plannedworkload=$objp->planned_workload;
-					$total_plannedworkload+=$plannedworkload;
-					if (! in_array('plannedworkload', $hiddenfields))
-					{
-						print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
-					}
-					if (! in_array('declaredprogress', $hiddenfields))
-					{
-						$declaredprogressworkload=$objp->declared_progess_workload;
-						$total_declaredprogressworkload+=$declaredprogressworkload;
-						print '<td align="right">';
-						//print $objp->planned_workload.'-'.$objp->declared_progess_workload."<br>";
-						print ($plannedworkload?round(100*$declaredprogressworkload/$plannedworkload,0).'%':'');
-						print '</td>';
-					}
-				}
-
-				print '<td align="right">'.$projectstatic->getLibStatut(3).'</td>';
-				print "</tr>\n";
-
-				$total_task = $total_task + $objp->nb;
-				$total_opp_amount = $total_opp_amount + $objp->opp_amount;
-				$ponderated_opp_amount = $ponderated_opp_amount + price2num($listofoppstatus[$objp->opp_status] * $objp->opp_amount / 100);
-			}
-
-			$i++;
-		}
-
-		print '<tr class="liste_total">';
-		print '<td colspan="2">'.$langs->trans("Total")."</td>";
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
-			print '<td class="liste_total" align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
-			print '<td class="liste_total" align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).'</td>';
-		}
-		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>';
-		}
-		print '<td class="liste_total"></td>';
-		print '</tr>';
-
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-
-	print "</table>";
-	print '</div>';
-
-	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
-	{
-		//Add the year filter input
-		print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<table width="100%">';
-		print '<tr>';
-		print '<td>'.$langs->trans("Year").'</td>';
-		print '<td style="text-align:right"><input type="text" size="4" class="flat" name="project_year_filter" value="'.$project_year_filter.'"/>';
-		print "</tr>\n";
-		print '</table></form>';
-	}
+    global $langs,$conf,$user,$bc;
+
+    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+    $projectstatic=new Project($db);
+    $thirdpartystatic=new Societe($db);
+
+    $sortfield='';
+    $sortorder='';
+    $project_year_filter=0;
+
+    $title=$langs->trans("Projects");
+    if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
+
+    $arrayidtypeofcontact=array();
+
+    print '<div class="div-table-responsive-no-min">';
+    print '<table class="noborder" width="100%">';
+
+    $sql= " FROM ".MAIN_DB_PREFIX."projet as p";
+    if ($mytasks)
+    {
+        $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
+        $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
+        $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
+    }
+    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 ($mytasks)
+    {
+        $sql.= " AND p.rowid = t.fk_projet";
+        $sql.= " AND ec.element_id = t.rowid";
+        $sql.= " AND ec.fk_socpeople = ".$user->id;
+        $sql.= " AND ec.fk_c_type_contact = ctc.rowid";   // Replace the 2 lines with ec.fk_c_type_contact in $arrayidtypeofcontact
+        $sql.= " AND ctc.element = 'project_task'";
+    }
+    if ($statut >= 0)
+    {
+        $sql.= " AND p.fk_statut = ".$statut;
+    }
+    if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
+    {
+        $project_year_filter = GETPOST("project_year_filter");
+        //Check if empty or invalid year. Wildcard ignores the sql check
+        if ($project_year_filter != "*")
+        {
+            if (empty($project_year_filter) || !ctype_digit($project_year_filter))
+            {
+                $project_year_filter = date("Y");
+            }
+            $sql.= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter,12,false)).")";
+            $sql.= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter,1,false)).")";
+        }
+    }
+
+    // Get id of project we must show tasks
+    $arrayidofprojects=array();
+    $sql1 = "SELECT p.rowid as projectid";
+    $sql1.= $sql;
+    $resql = $db->query($sql1);
+    if ($resql)
+    {
+        $i=0;
+        $num = $db->num_rows($resql);
+        while ($i < $num)
+        {
+            $objp = $db->fetch_object($resql);
+            $arrayidofprojects[$objp->projectid]=$objp->projectid;
+            $i++;
+        }
+    }
+    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,";
+    $sql2.= " p.dateo, p.datee,";
+    $sql2.= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
+    $sql2.= " FROM ".MAIN_DB_PREFIX."projet as p";
+    $sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
+    $sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
+    $sql2.= " WHERE p.rowid IN (".join(',',$arrayidofprojects).")";
+    $sql2.= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.nom, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_amount, p.dateo, p.datee";
+    $sql2.= " ORDER BY p.title, p.ref";
+
+    $resql = $db->query($sql2);
+    if ($resql)
+    {
+        $total_task = 0;
+        $total_opp_amount = 0;
+        $ponderated_opp_amount = 0;
+
+        $num = $db->num_rows($resql);
+        $i = 0;
+
+        print '<tr class="liste_titre">';
+        print_liste_field_titre($title.' <span class="badge">'.$num.'</span>',$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
+        print_liste_field_titre("ThirdParty",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
+        if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+        {
+            print_liste_field_titre("OpportunityAmount","","","","",'align="right"',$sortfield,$sortorder);
+            print_liste_field_titre("OpportunityStatus","","","","",'align="right"',$sortfield,$sortorder);
+        }
+        if (empty($conf->global->PROJECT_HIDE_TASKS))
+        {
+            print_liste_field_titre("Tasks","","","","",'align="right"',$sortfield,$sortorder);
+            if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
+            if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
+        }
+        print_liste_field_titre("Status","","","","",'align="right"',$sortfield,$sortorder);
+        print "</tr>\n";
+
+        $total_plannedworkload=0;
+        $total_declaredprogressworkload=0;
+        while ($i < $num)
+        {
+            $objp = $db->fetch_object($resql);
+
+            $projectstatic->id = $objp->projectid;
+            $projectstatic->user_author_id = $objp->fk_user_creat;
+            $projectstatic->public = $objp->public;
+
+            // Check is user has read permission on project
+            $userAccess = $projectstatic->restrictedProjectArea($user);
+            if ($userAccess >= 0)
+            {
+                $projectstatic->ref=$objp->ref;
+                $projectstatic->statut = $objp->status;
+                $projectstatic->title = $objp->title;
+                $projectstatic->datee = $db->jdate($objp->datee);
+                $projectstatic->dateo = $db->jdate($objp->dateo);
+
+
+                print '<tr class="oddeven">';
+                print '<td>';
+                print $projectstatic->getNomUrl(1);
+                if (! in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title,24);
+                print '</td>';
+                print '<td>';
+                if ($objp->fk_soc > 0)
+                {
+                    $thirdpartystatic->id=$objp->fk_soc;
+                    $thirdpartystatic->ref=$objp->socname;
+                    $thirdpartystatic->name=$objp->socname;
+                    print $thirdpartystatic->getNomUrl(1);
+                }
+                print '</td>';
+                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);
+                    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);
+                    print '</td>';
+                }
+                if (empty($conf->global->PROJECT_HIDE_TASKS))
+                {
+                    print '<td align="right">'.$objp->nb.'</td>';
+
+                    $plannedworkload=$objp->planned_workload;
+                    $total_plannedworkload+=$plannedworkload;
+                    if (! in_array('plannedworkload', $hiddenfields))
+                    {
+                        print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
+                    }
+                    if (! in_array('declaredprogress', $hiddenfields))
+                    {
+                        $declaredprogressworkload=$objp->declared_progess_workload;
+                        $total_declaredprogressworkload+=$declaredprogressworkload;
+                        print '<td align="right">';
+                        //print $objp->planned_workload.'-'.$objp->declared_progess_workload."<br>";
+                        print ($plannedworkload?round(100*$declaredprogressworkload/$plannedworkload,0).'%':'');
+                        print '</td>';
+                    }
+                }
+
+                print '<td align="right">'.$projectstatic->getLibStatut(3).'</td>';
+                print "</tr>\n";
+
+                $total_task = $total_task + $objp->nb;
+                $total_opp_amount = $total_opp_amount + $objp->opp_amount;
+                $ponderated_opp_amount = $ponderated_opp_amount + price2num($listofoppstatus[$objp->opp_status] * $objp->opp_amount / 100);
+            }
+
+            $i++;
+        }
+
+        print '<tr class="liste_total">';
+        print '<td colspan="2">'.$langs->trans("Total")."</td>";
+        if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+        {
+            print '<td class="liste_total" align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
+            print '<td class="liste_total" align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).'</td>';
+        }
+        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>';
+        }
+        print '<td class="liste_total"></td>';
+        print '</tr>';
+
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+
+    print "</table>";
+    print '</div>';
+
+    if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
+    {
+        //Add the year filter input
+        print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
+        print '<table width="100%">';
+        print '<tr>';
+        print '<td>'.$langs->trans("Year").'</td>';
+        print '<td style="text-align:right"><input type="text" size="4" class="flat" name="project_year_filter" value="'.$project_year_filter.'"/>';
+        print "</tr>\n";
+        print '</table></form>';
+    }
 }

Spacing +355 added lines, -355 removed lines

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

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

Indentation +263 added lines, -263 removed lines

@@ -25,16 +25,16 @@ 
 
 if (! function_exists('json_encode'))
 {
-	/**
-	 * Implement json_encode for PHP that does not have module enabled.
-	 *
-	 * @param	mixed	$elements		PHP Object to json encode
-	 * @return 	string					Json encoded string
-	 */
-	function json_encode($elements)
-	{
-		return dol_json_encode($elements);
-	}
+    /**
+     * Implement json_encode for PHP that does not have module enabled.
+     *
+     * @param	mixed	$elements		PHP Object to json encode
+     * @return 	string					Json encoded string
+     */
+    function json_encode($elements)
+    {
+        return dol_json_encode($elements);
+    }
 }
 
 /**
@@ -47,56 +47,56 @@ 
  */
 function dol_json_encode($elements)
 {
-	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
-	{
-		foreach($elements as $key => $value) $num++;
-	}
-	else
-	{
-	    $num=count($elements);
-	}
-	//var_dump($num);
-
-	// determine type
-	if (is_numeric(key($elements)) && key($elements) == 0)
-	{
-		// indexed (list)
-		$keysofelements=array_keys($elements);	// Elements array mus have key that does not start with 0 and end with num-1, so we will use this later.
-		$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.= ',';
-		}
-		$output.= ']';
-	}
-	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);
-		foreach($tmpelements as $key => $value)
-		{
-			$output .= '"'.$key.'":';
-			if (is_array($value)) $output.= json_encode($value);
-			else $output .= _val($value);
-			if ($i !== $last) $output.= ',';
-			++$i;
-		}
-		$output.= '}';
-	}
-
-	// return
-	return $output;
+    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
+    {
+        foreach($elements as $key => $value) $num++;
+    }
+    else
+    {
+        $num=count($elements);
+    }
+    //var_dump($num);
+
+    // determine type
+    if (is_numeric(key($elements)) && key($elements) == 0)
+    {
+        // indexed (list)
+        $keysofelements=array_keys($elements);	// Elements array mus have key that does not start with 0 and end with num-1, so we will use this later.
+        $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.= ',';
+        }
+        $output.= ']';
+    }
+    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);
+        foreach($tmpelements as $key => $value)
+        {
+            $output .= '"'.$key.'":';
+            if (is_array($value)) $output.= json_encode($value);
+            else $output .= _val($value);
+            if ($i !== $last) $output.= ',';
+            ++$i;
+        }
+        $output.= '}';
+    }
+
+    // return
+    return $output;
 }
 
 /**
@@ -107,8 +107,8 @@ 
  */
 function _val($val)
 {
-	if (is_string($val))
-	{
+    if (is_string($val))
+    {
         // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
         $ascii = '';
         $strlen_var = strlen($val);
@@ -117,107 +117,107 @@ 
 	     * Iterate over every character in the string,
 	     * escaping with a slash or encoding to UTF-8 where necessary
 	     */
-	    for ($c = 0; $c < $strlen_var; ++$c) {
-
-	        $ord_var_c = ord($val{$c});
-
-	        switch (true) {
-	            case $ord_var_c == 0x08:
-	                $ascii .= '\b';
-	                break;
-	            case $ord_var_c == 0x09:
-	                $ascii .= '\t';
-	                break;
-	            case $ord_var_c == 0x0A:
-	                $ascii .= '\n';
-	                break;
-	            case $ord_var_c == 0x0C:
-	                $ascii .= '\f';
-	                break;
-	            case $ord_var_c == 0x0D:
-	                $ascii .= '\r';
-	                break;
-
-	            case $ord_var_c == 0x22:
-	            case $ord_var_c == 0x2F:
-	            case $ord_var_c == 0x5C:
-	                // double quote, slash, slosh
-	                $ascii .= '\\'.$val{$c};
-	                break;
-
-	            case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-	                // characters U-00000000 - U-0000007F (same as ASCII)
-	                $ascii .= $val{$c};
-	                break;
-
-	            case (($ord_var_c & 0xE0) == 0xC0):
-	                // characters U-00000080 - U-000007FF, mask 110XXXXX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val{$c + 1}));
-	                $c += 1;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
-
-	            case (($ord_var_c & 0xF0) == 0xE0):
-	                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}));
-	                $c += 2;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
-
-	            case (($ord_var_c & 0xF8) == 0xF0):
-	                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}), ord($val{$c + 3}));
-	                $c += 3;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
-
-	            case (($ord_var_c & 0xFC) == 0xF8):
-	                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}), ord($val{$c + 3}), ord($val{$c + 4}));
-	                $c += 4;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
-
-	            case (($ord_var_c & 0xFE) == 0xFC):
-	                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}), ord($val{$c + 3}), ord($val{$c + 4}), ord($val{$c + 5}));
-	                $c += 5;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
-	        }
-	    }
-
-	    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';
+        for ($c = 0; $c < $strlen_var; ++$c) {
+
+            $ord_var_c = ord($val{$c});
+
+            switch (true) {
+                case $ord_var_c == 0x08:
+                    $ascii .= '\b';
+                    break;
+                case $ord_var_c == 0x09:
+                    $ascii .= '\t';
+                    break;
+                case $ord_var_c == 0x0A:
+                    $ascii .= '\n';
+                    break;
+                case $ord_var_c == 0x0C:
+                    $ascii .= '\f';
+                    break;
+                case $ord_var_c == 0x0D:
+                    $ascii .= '\r';
+                    break;
+
+                case $ord_var_c == 0x22:
+                case $ord_var_c == 0x2F:
+                case $ord_var_c == 0x5C:
+                    // double quote, slash, slosh
+                    $ascii .= '\\'.$val{$c};
+                    break;
+
+                case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+                    // characters U-00000000 - U-0000007F (same as ASCII)
+                    $ascii .= $val{$c};
+                    break;
+
+                case (($ord_var_c & 0xE0) == 0xC0):
+                    // characters U-00000080 - U-000007FF, mask 110XXXXX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c, ord($val{$c + 1}));
+                    $c += 1;
+                    $utf16 = utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+
+                case (($ord_var_c & 0xF0) == 0xE0):
+                    // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}));
+                    $c += 2;
+                    $utf16 = utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+
+                case (($ord_var_c & 0xF8) == 0xF0):
+                    // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}), ord($val{$c + 3}));
+                    $c += 3;
+                    $utf16 = utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+
+                case (($ord_var_c & 0xFC) == 0xF8):
+                    // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}), ord($val{$c + 3}), ord($val{$c + 4}));
+                    $c += 4;
+                    $utf16 = utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+
+                case (($ord_var_c & 0xFE) == 0xFC):
+                    // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}), ord($val{$c + 3}), ord($val{$c + 4}), ord($val{$c + 5}));
+                    $c += 5;
+                    $utf16 = utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+            }
+        }
+
+        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';
 }
 
 if (! function_exists('json_decode'))
 {
-	/**
-	 * Implement json_decode for PHP that does not support it
-	 *
-	 * @param	string	$json		Json encoded to PHP Object or Array
-	 * @param	bool	$assoc		False return an object, true return an array
-	 * @return 	mixed				Object or Array
-	 */
-	function json_decode($json, $assoc=false)
-	{
-		return dol_json_decode($json, $assoc);
-	}
+    /**
+     * Implement json_decode for PHP that does not support it
+     *
+     * @param	string	$json		Json encoded to PHP Object or Array
+     * @param	bool	$assoc		False return an object, true return an array
+     * @return 	mixed				Object or Array
+     */
+    function json_decode($json, $assoc=false)
+    {
+        return dol_json_decode($json, $assoc);
+    }
 }
 
 /**
@@ -231,52 +231,52 @@ 
  */
 function dol_json_decode($json, $assoc=false)
 {
-	dol_syslog("For better performance, enable the native json in your PHP", LOG_WARNING);
+    dol_syslog("For better performance, enable the native json in your PHP", LOG_WARNING);
 
-	$comment = false;
+    $comment = false;
 
     $out='';
-	$strLength = strlen($json);    // Must stay strlen and not dol_strlen because we want technical length, not visible length
-	for ($i=0; $i<$strLength; $i++)
-	{
-		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];
-		}
-		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();
-
-	// Return an object
-	if (! $assoc)
-	{
-		if (! empty($array))
-		{
-			$object = false;
-			if (count($array)>0) {
-				$object = (object) array();
-			}
-			foreach ($array as $key => $value)
-			{
-				if ($key) $object->{$key} = $value;
-			}
-
-			return $object;
-		}
-
-		return false;
-	}
-
-	return $array;
+    $strLength = strlen($json);    // Must stay strlen and not dol_strlen because we want technical length, not visible length
+    for ($i=0; $i<$strLength; $i++)
+    {
+        if (! $comment)
+        {
+            if (($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;
+    }
+
+    $out=_unval($out);
+
+    // Return an array
+    if ($out != '') eval('$array = '.$out.';');
+    else $array=array();
+
+    // Return an object
+    if (! $assoc)
+    {
+        if (! empty($array))
+        {
+            $object = false;
+            if (count($array)>0) {
+                $object = (object) array();
+            }
+            foreach ($array as $key => $value)
+            {
+                if ($key) $object->{$key} = $value;
+            }
+
+            return $object;
+        }
+
+        return false;
+    }
+
+    return $array;
 }
 
 /**
@@ -287,14 +287,14 @@ 
  */
 function _unval($val)
 {
-	while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg))
-	{
-	    // single, escaped unicode character
-	    $utf16 = chr(hexdec($reg[1])) . chr(hexdec($reg[2]));
-	    $utf8  = utf162utf8($utf16);
-	    $val=preg_replace('/\\\u'.$reg[1].$reg[2].'/i',$utf8,$val);
-	}
-	return $val;
+    while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg))
+    {
+        // single, escaped unicode character
+        $utf16 = chr(hexdec($reg[1])) . chr(hexdec($reg[2]));
+        $utf8  = utf162utf8($utf16);
+        $val=preg_replace('/\\\u'.$reg[1].$reg[2].'/i',$utf8,$val);
+    }
+    return $val;
 }
 
 /**
@@ -309,35 +309,35 @@ 
  */
 function utf162utf8($utf16)
 {
-	// oh please oh please oh please oh please oh please
-	if(function_exists('mb_convert_encoding')) {
-	    return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-	}
-
-	$bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
-
-	switch(true) {
-    	case ((0x7F & $bytes) == $bytes):
-    	// this case should never be reached, because we are in ASCII range
-    	// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-    	return chr($bytes);
-
-    	case (0x07FF & $bytes) == $bytes:
-    	// return a 2-byte UTF-8 character
-    	// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-    	return chr(0xC0 | (($bytes >> 6) & 0x1F))
-    	. chr(0x80 | ($bytes & 0x3F));
-
-    	case (0xFFFF & $bytes) == $bytes:
-    	// return a 3-byte UTF-8 character
-    	// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-    	return chr(0xE0 | (($bytes >> 12) & 0x0F))
-    	. chr(0x80 | (($bytes >> 6) & 0x3F))
-    	. chr(0x80 | ($bytes & 0x3F));
-	}
-
-	// ignoring UTF-32 for now, sorry
-	return '';
+    // oh please oh please oh please oh please oh please
+    if(function_exists('mb_convert_encoding')) {
+        return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+    }
+
+    $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+
+    switch(true) {
+        case ((0x7F & $bytes) == $bytes):
+        // this case should never be reached, because we are in ASCII range
+        // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        return chr($bytes);
+
+        case (0x07FF & $bytes) == $bytes:
+        // return a 2-byte UTF-8 character
+        // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        return chr(0xC0 | (($bytes >> 6) & 0x1F))
+        . chr(0x80 | ($bytes & 0x3F));
+
+        case (0xFFFF & $bytes) == $bytes:
+        // return a 3-byte UTF-8 character
+        // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        return chr(0xE0 | (($bytes >> 12) & 0x0F))
+        . chr(0x80 | (($bytes >> 6) & 0x3F))
+        . chr(0x80 | ($bytes & 0x3F));
+    }
+
+    // ignoring UTF-32 for now, sorry
+    return '';
 }
 
 /**
@@ -352,28 +352,28 @@ 
  */
 function utf82utf16($utf8)
 {
-	// oh please oh please oh please oh please oh please
-	if(function_exists('mb_convert_encoding')) {
-	return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-	}
-
-	switch(strlen($utf8)) {
-		case 1:
-	        	// this case should never be reached, because we are in ASCII range
-		// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-		return $utf8;
-
-		case 2:
-		// return a UTF-16 character from a 2-byte UTF-8 char
-		// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-		return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
-
-		case 3:
-		// return a UTF-16 character from a 3-byte UTF-8 char
-		// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-		return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
-	}
-
-	// ignoring UTF-32 for now, sorry
-	return '';
+    // oh please oh please oh please oh please oh please
+    if(function_exists('mb_convert_encoding')) {
+    return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+    }
+
+    switch(strlen($utf8)) {
+        case 1:
+                // this case should never be reached, because we are in ASCII range
+        // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        return $utf8;
+
+        case 2:
+        // return a UTF-16 character from a 2-byte UTF-8 char
+        // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
+
+        case 3:
+        // return a UTF-16 character from a 3-byte UTF-8 char
+        // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
+    }
+
+    // ignoring UTF-32 for now, sorry
+    return '';
 }

Spacing +42 added lines, -42 removed lines

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

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

Indentation +113 added lines, -113 removed lines

@@ -40,129 +40,129 @@
  */
 function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierline=0)
 {
-	global $db, $conf, $langs;
+    global $db, $conf, $langs;
 
-	$idprod=$line->fk_product;
-	$label=(! empty($line->label)?$line->label:(! empty($line->libelle)?$line->libelle:''));
-	$desc=(! empty($line->desc)?$line->desc:(! empty($line->description)?$line->description:''));
-	$ref_supplier=(! empty($line->ref_supplier)?$line->ref_supplier:(! empty($line->ref_fourn)?$line->ref_fourn:''));    // TODO Not yet saved for supplier invoices, only supplier orders
-	$note=(! empty($line->note)?$line->note:'');
+    $idprod=$line->fk_product;
+    $label=(! empty($line->label)?$line->label:(! empty($line->libelle)?$line->libelle:''));
+    $desc=(! empty($line->desc)?$line->desc:(! empty($line->description)?$line->description:''));
+    $ref_supplier=(! empty($line->ref_supplier)?$line->ref_supplier:(! empty($line->ref_fourn)?$line->ref_fourn:''));    // TODO Not yet saved for supplier invoices, only supplier orders
+    $note=(! empty($line->note)?$line->note:'');
 
-	if ($issupplierline) $prodser = new ProductFournisseur($db);
-	else $prodser = new Product($db);
+    if ($issupplierline) $prodser = new ProductFournisseur($db);
+    else $prodser = new Product($db);
 
-	if ($idprod)
-	{
-		$prodser->fetch($idprod);
-		// If a predefined product and multilang and on other lang, we renamed label with label translated
-		if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
-		{
-			if (! empty($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 ($idprod)
+    {
+        $prodser->fetch($idprod);
+        // If a predefined product and multilang and on other lang, we renamed label with label translated
+        if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
+        {
+            if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label)     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
+            if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
+            if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note)        $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
+        }
+    }
 
-	// Description short of product line
-	$libelleproduitservice=$label;
+    // Description short of product line
+    $libelleproduitservice=$label;
 
-	// Description long of product line
-	if ($desc && ($desc != $label))
-	{
-		if ($desc == '(CREDIT_NOTE)' && $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("DiscountFromCreditNote",$sourceref);
-		}
-		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)
-		{
-			$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)
-		{
-			$discount=new DiscountAbsolute($db);
-			$discount->fetch($line->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
-		}
-		else
-		{
-			if ($idprod)
-			{
-				if (empty($hidedesc)) $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
-			}
-			else
-			{
-				$libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
-			}
-		}
-	}
+    // Description long of product line
+    if ($desc && ($desc != $label))
+    {
+        if ($desc == '(CREDIT_NOTE)' && $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("DiscountFromCreditNote",$sourceref);
+        }
+        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)
+        {
+            $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)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($line->fk_remise_except);
+            $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
+        }
+        else
+        {
+            if ($idprod)
+            {
+                if (empty($hidedesc)) $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
+            }
+            else
+            {
+                $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
+            }
+        }
+    }
 
-	// If line linked to a product
-	if ($idprod)
-	{
-		// On ajoute la ref
-		if ($prodser->ref)
-		{
-			$prefix_prodserv = "";
-			$ref_prodserv = "";
-			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
-				{
-					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
-				}
-			}
+    // If line linked to a product
+    if ($idprod)
+    {
+        // On ajoute la ref
+        if ($prodser->ref)
+        {
+            $prefix_prodserv = "";
+            $ref_prodserv = "";
+            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
+                {
+                    $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
+                }
+            }
 
-			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 (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
 
-				$ref_prodserv .= " - ";
-			}
+                $ref_prodserv .= " - ";
+            }
 
-			$libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
-		}
-	}
+            $libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
+        }
+    }
 
-	if (! empty($line->date_start) || ! empty($line->date_end))
-	{
-		$format='day';
-		// Show duration if exists
-		if ($line->date_start && $line->date_end)
-		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($line->date_start, $format, false, $outputlangs),dol_print_date($line->date_end, $format, false, $outputlangs)).')';
-		}
-		if ($line->date_start && ! $line->date_end)
-		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($line->date_start, $format, false, $outputlangs)).')';
-		}
-		if (! $line->date_start && $line->date_end)
-		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($line->date_end, $format, false, $outputlangs)).')';
-		}
-		//print '>'.$outputlangs->charset_output.','.$period;
-		$libelleproduitservice=dol_concatdesc($libelleproduitservice, $period);
-		//print $libelleproduitservice;
-	}
+    if (! empty($line->date_start) || ! empty($line->date_end))
+    {
+        $format='day';
+        // Show duration if exists
+        if ($line->date_start && $line->date_end)
+        {
+            $period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($line->date_start, $format, false, $outputlangs),dol_print_date($line->date_end, $format, false, $outputlangs)).')';
+        }
+        if ($line->date_start && ! $line->date_end)
+        {
+            $period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($line->date_start, $format, false, $outputlangs)).')';
+        }
+        if (! $line->date_start && $line->date_end)
+        {
+            $period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($line->date_end, $format, false, $outputlangs)).')';
+        }
+        //print '>'.$outputlangs->charset_output.','.$period;
+        $libelleproduitservice=dol_concatdesc($libelleproduitservice, $period);
+        //print $libelleproduitservice;
+    }
 
-	return $libelleproduitservice;
+    return $libelleproduitservice;
 }
 

Spacing +35 added lines, -35 removed lines

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

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

Indentation +549 added lines, -549 removed lines

@@ -41,10 +41,10 @@ 
     $h = 0;
     $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Card');
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Card');
+    $head[$h][2] = 'card';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -52,16 +52,16 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'tax');
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $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>';
+    $head[$h][2] = 'documents';
+    $h++;
 
     $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/info.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Info");
@@ -95,39 +95,39 @@ 
     // If we use date_start and date_end, we must not use $y, $m, $q
     if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q)))
     {
-    	dol_print_error('', 'Bad value of input parameter for tax_by_rate');
+        dol_print_error('', 'Bad value of input parameter for tax_by_rate');
     }
 
     $list=array();
     if ($direction == 'sell')
     {
-    	$invoicetable='facture';
-    	$invoicedettable='facturedet';
-    	$fk_facture='fk_facture';
-    	$fk_facture2='fk_facture';
-    	$fk_payment='fk_paiement';
-    	$total_tva='total_tva';
-    	$paymenttable='paiement';
-    	$paymentfacturetable='paiement_facture';
-    	$invoicefieldref='ref';
+        $invoicetable='facture';
+        $invoicedettable='facturedet';
+        $fk_facture='fk_facture';
+        $fk_facture2='fk_facture';
+        $fk_payment='fk_paiement';
+        $total_tva='total_tva';
+        $paymenttable='paiement';
+        $paymentfacturetable='paiement_facture';
+        $invoicefieldref='ref';
     }
     if ($direction == 'buy')
     {
-    	$invoicetable='facture_fourn';
-    	$invoicedettable='facture_fourn_det';
-    	$fk_facture='fk_facture_fourn';
-    	$fk_facture2='fk_facturefourn';
-    	$fk_payment='fk_paiementfourn';
-    	$total_tva='tva';
-    	$paymenttable='paiementfourn';
-    	$paymentfacturetable='paiementfourn_facturefourn';
-    	$invoicefieldref='ref';
+        $invoicetable='facture_fourn';
+        $invoicedettable='facture_fourn_det';
+        $fk_facture='fk_facture_fourn';
+        $fk_facture2='fk_facturefourn';
+        $fk_payment='fk_paiementfourn';
+        $total_tva='tva';
+        $paymenttable='paiementfourn';
+        $paymentfacturetable='paiementfourn_facturefourn';
+        $invoicefieldref='ref';
     }
 
     if ( strpos( $type, 'localtax' ) === 0 ) {
-    	$f_rate = $type . '_tx';
+        $f_rate = $type . '_tx';
     } else {
-    	$f_rate = 'tva_tx';
+        $f_rate = 'tva_tx';
     }
 
     $total_localtax1='total_localtax1';
@@ -139,146 +139,146 @@ 
     // Define sql request
     $sql='';
     if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
+        || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
     {
-    	// Count on delivery date (use invoice date as delivery is unknown)
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " 0 as payment_id, 0 as payment_amount";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	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)
-    	{
-    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-    	}
-    	if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = 0";                              // Limit to products
-    	$sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture;
+        // Count on delivery date (use invoice date as delivery is unknown)
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql.= " 0 as payment_id, 0 as payment_amount";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+        else $sql.= " AND f.type IN (0,1,2,3,5)";
+        $sql.= " AND f.rowid = d.".$fk_facture;
+        $sql.= " AND s.rowid = f.fk_soc";
+        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)
+        {
+            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+        }
+        if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = 0";                              // Limit to products
+        $sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else
     {
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql.= " pa.datep as datep";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	$sql.= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql.= " AND pa.rowid = pf.".$fk_payment;
-    	if ($y && $m)
-    	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-    	}
-    	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)."'";
-    	$sql.= " AND (d.product_type = 0";                              // Limit to products
-    	$sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+        // Count on payments date
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+        $sql.= " pa.datep as datep";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+        $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+        else $sql.= " AND f.type IN (0,1,2,3,5)";
+        $sql.= " AND f.rowid = d.".$fk_facture;
+        $sql.= " AND s.rowid = f.fk_soc";
+        $sql.= " AND pf.".$fk_facture2." = f.rowid";
+        $sql.= " AND pa.rowid = pf.".$fk_payment;
+        if ($y && $m)
+        {
+            $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+            $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+        }
+        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)."'";
+        $sql.= " AND (d.product_type = 0";                              // Limit to products
+        $sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
     if (! $sql) return -1;
     if ($sql == 'TODO') return -2;
     if ($sql != 'TODO')
     {
-    	dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);
-
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$company_id = -1;
-    		$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 ($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'];
-    				$list[$assoc['company_id']]['localtax2']      += $assoc['total_localtax2'];
-    			}
-    			$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
-    			$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
-    			$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
-    			$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
-    			$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
-    			$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
-    			$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
-    			$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-    			$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
-
-    			$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
-    			$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
-    			$list[$assoc['company_id']]['type'][] = $assoc['type'];
-    			$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-    			$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
-
-    			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
-    			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
-    			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    			$list[$assoc['company_id']]['localtax2_list'][]  = $assoc['total_localtax2'];
-
-    			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
-    			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
-    			$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
-
-    			$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
-    			$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
-
-    			$company_id = $assoc['company_id'];
-    		}
-    	}
-    	else
-    	{
-    		dol_print_error($db);
-    		return -3;
-    	}
+        dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);
+
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $company_id = -1;
+            $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 ($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'];
+                    $list[$assoc['company_id']]['localtax2']      += $assoc['total_localtax2'];
+                }
+                $list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+                $list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
+                $list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
+                $list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
+                $list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
+                $list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
+                $list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+                $list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+                $list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+                $list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+                $list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+                $list[$assoc['company_id']]['type'][] = $assoc['type'];
+                $list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+                $list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+
+                $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+                $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+                $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+                $list[$assoc['company_id']]['localtax2_list'][]  = $assoc['total_localtax2'];
+
+                $list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+                $list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+                $list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
+
+                $list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+                $list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+
+                $company_id = $assoc['company_id'];
+            }
+        }
+        else
+        {
+            dol_print_error($db);
+            return -3;
+        }
     }
 
 
@@ -287,149 +287,149 @@ 
     // Define sql request
     $sql='';
     if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+        || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
     {
-    	// Count on invoice date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " 0 as payment_id, 0 as payment_amount";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	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)
-    	{
-    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-    	}
-    	if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = 1";                              // Limit to services
-    	$sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture;
+        // Count on invoice date
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql.= " 0 as payment_id, 0 as payment_amount";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+        else $sql.= " AND f.type IN (0,1,2,3,5)";
+        $sql.= " AND f.rowid = d.".$fk_facture;
+        $sql.= " AND s.rowid = f.fk_soc";
+        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)
+        {
+            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+        }
+        if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = 1";                              // Limit to services
+        $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else
     {
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql.= " pa.datep as datep";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	$sql.= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql.= " AND pa.rowid = pf.".$fk_payment;
-    	if ($y && $m)
-    	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-    	}
-    	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)."'";
-    	$sql.= " AND (d.product_type = 1";                              		// Limit to services
-    	$sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+        // Count on payments date
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+        $sql.= " pa.datep as datep";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+        $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+        else $sql.= " AND f.type IN (0,1,2,3,5)";
+        $sql.= " AND f.rowid = d.".$fk_facture;
+        $sql.= " AND s.rowid = f.fk_soc";
+        $sql.= " AND pf.".$fk_facture2." = f.rowid";
+        $sql.= " AND pa.rowid = pf.".$fk_payment;
+        if ($y && $m)
+        {
+            $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+            $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+        }
+        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)."'";
+        $sql.= " AND (d.product_type = 1";                              		// Limit to services
+        $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
     if (! $sql)
     {
-    	dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
-    	return -1;  // -1 = Not accountancy module enabled
+        dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
+        return -1;  // -1 = Not accountancy module enabled
     }
     if ($sql == 'TODO') return -2; // -2 = Feature not yet available
     if ($sql != 'TODO')
     {
-    	dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$company_id = -1;
-    		$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 ($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'];
-    				$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
-    			}
-    			$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
-    			$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
-    			$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
-    			$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
-    			$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
-    			$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
-    			$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
-    			$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-    			$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
-
-    			$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
-    			$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
-    			$list[$assoc['company_id']]['type'][] = $assoc['type'];
-    			$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-    			$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
-
-    			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
-    			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
-    			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    			$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
-
-    			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
-    			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
-    			$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
-
-    			$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
-    			$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
-
-    			$company_id = $assoc['company_id'];
-    		}
-    	}
-    	else
-    	{
-    		dol_print_error($db);
-    		return -3;
-    	}
+        dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $company_id = -1;
+            $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 ($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'];
+                    $list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
+                }
+                $list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+                $list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
+                $list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
+                $list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
+                $list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
+                $list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
+                $list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+                $list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+                $list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+                $list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+                $list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+                $list[$assoc['company_id']]['type'][] = $assoc['type'];
+                $list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+                $list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+
+                $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+                $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+                $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+                $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+
+                $list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+                $list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+                $list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
+
+                $list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+                $list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+
+                $company_id = $assoc['company_id'];
+            }
+        }
+        else
+        {
+            dol_print_error($db);
+            return -3;
+        }
     }
 
 
@@ -437,104 +437,104 @@ 
 
     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,";
-    	$sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
-    	$sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
-    	$sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
-    	$sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
-    	$sql.= " WHERE e.entity = " . $conf->entity;
-    	$sql.= " AND e.fk_statut in (6)";
-    	if ($y && $m)
-    	{
-    		$sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-    	}
-    	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)."'";
-    	$sql.= " AND (d.product_type = -1";
-    	$sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)";       // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
-    	$sql.= " ORDER BY e.rowid";
-
-    	if (! $sql)
-    	{
-    		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
-    		return -1;  // -1 = Not accountancy module enabled
-    	}
-    	if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-    	if ($sql != 'TODO')
-    	{
-    		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-    		$resql = $db->query($sql);
-    		if ($resql)
-    		{
-    			$company_id = -1;
-    			$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 ($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'];
-    					$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
-    				}
-
-    				$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
-    				$list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment';
-    				$list[$assoc['company_id']]['datef'][] = $assoc['datef'];
-    				$list[$assoc['company_id']]['company_name'][] = '';
-    				$list[$assoc['company_id']]['company_id'][] = '';
-    				$list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author'];
-    				$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
-    				$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-    				$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
-
-    				$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
-    				$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
-    				$list[$assoc['company_id']]['type'][] = $assoc['type'];
-    				$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-    				$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
-
-    				$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
-    				$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
-    				$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    				$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
-
-    				$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
-    				$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
-    				$list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment';
-
-    				$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
-    				$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
-
-    				$company_id = $assoc['company_id'];
-    			}
-    		}
-    		else
-    		{
-    			dol_print_error($db);
-    			return -3;
-    		}
-    	}
+        // 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,";
+        $sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
+        $sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
+        $sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
+        $sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
+        $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
+        $sql.= " WHERE e.entity = " . $conf->entity;
+        $sql.= " AND e.fk_statut in (6)";
+        if ($y && $m)
+        {
+            $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+            $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+        }
+        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)."'";
+        $sql.= " AND (d.product_type = -1";
+        $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)";       // enhance detection of service
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+        $sql.= " ORDER BY e.rowid";
+
+        if (! $sql)
+        {
+            dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
+            return -1;  // -1 = Not accountancy module enabled
+        }
+        if ($sql == 'TODO') return -2; // -2 = Feature not yet available
+        if ($sql != 'TODO')
+        {
+            dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $company_id = -1;
+                $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 ($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'];
+                        $list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
+                    }
+
+                    $list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+                    $list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment';
+                    $list[$assoc['company_id']]['datef'][] = $assoc['datef'];
+                    $list[$assoc['company_id']]['company_name'][] = '';
+                    $list[$assoc['company_id']]['company_id'][] = '';
+                    $list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author'];
+                    $list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+                    $list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+                    $list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+                    $list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+                    $list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+                    $list[$assoc['company_id']]['type'][] = $assoc['type'];
+                    $list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+                    $list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+
+                    $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+                    $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+                    $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+                    $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+
+                    $list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+                    $list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+                    $list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment';
+
+                    $list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+                    $list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+
+                    $company_id = $assoc['company_id'];
+                }
+            }
+            else
+            {
+                dol_print_error($db);
+                return -3;
+            }
+        }
     }
 
     return $list;
@@ -563,7 +563,7 @@ 
     // If we use date_start and date_end, we must not use $y, $m, $q
     if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q)))
     {
-    	dol_print_error('', 'Bad value of input parameter for tax_by_rate');
+        dol_print_error('', 'Bad value of input parameter for tax_by_rate');
     }
 
     $list=array();
@@ -593,14 +593,14 @@ 
         $invoicefieldref='ref';
     }
 
-	if ( strpos( $type, 'localtax' ) === 0 ) {
-		$f_rate = $type . '_tx';
-	} else {
-		$f_rate = 'tva_tx';
-	}
+    if ( strpos( $type, 'localtax' ) === 0 ) {
+        $f_rate = $type . '_tx';
+    } else {
+        $f_rate = 'tva_tx';
+    }
 
-	$total_localtax1='total_localtax1';
-	$total_localtax2='total_localtax2';
+    $total_localtax1='total_localtax1';
+    $total_localtax2='total_localtax2';
 
 
     // CAS DES BIENS/PRODUITS
@@ -608,7 +608,7 @@ 
     // Define sql request
     $sql='';
     if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
+        || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
     {
         // Count on delivery date (use invoice date as delivery is unknown)
         $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
@@ -646,44 +646,44 @@ 
     }
     else
     {
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql.= " pa.datep as datep";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	$sql.= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql.= " AND pa.rowid = pf.".$fk_payment;
-    	if ($y && $m)
-    	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-    	}
-    	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)."'";
-    	$sql.= " AND (d.product_type = 0";                              // Limit to products
-    	$sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+        // Count on payments date
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+        $sql.= " pa.datep as datep";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+        $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+        else $sql.= " AND f.type IN (0,1,2,3,5)";
+        $sql.= " AND f.rowid = d.".$fk_facture;
+        $sql.= " AND s.rowid = f.fk_soc";
+        $sql.= " AND pf.".$fk_facture2." = f.rowid";
+        $sql.= " AND pa.rowid = pf.".$fk_payment;
+        if ($y && $m)
+        {
+            $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+            $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+        }
+        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)."'";
+        $sql.= " AND (d.product_type = 0";                              // Limit to products
+        $sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
     if (! $sql) return -1;
@@ -699,8 +699,8 @@ 
             $oldrowid='';
             while($assoc = $db->fetch_array($resql))
             {
-            	// Code to avoid warnings when array entry not defined
-            	if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
+                // 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;
@@ -756,7 +756,7 @@ 
     // Define sql request
     $sql='';
     if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+        || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
     {
         // Count on invoice date
         $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
@@ -772,7 +772,7 @@ 
         $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)";
+        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)
@@ -811,7 +811,7 @@ 
         $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)";
+        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";
@@ -850,10 +850,10 @@ 
             $oldrowid='';
             while($assoc = $db->fetch_array($resql))
             {
-            	// Code to avoid warnings when array entry not defined
-            	if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
+                // 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']]['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
@@ -904,108 +904,108 @@ 
 
     // CASE OF EXPENSE REPORT
 
-	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,";
-		$sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
-		$sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
-		$sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
-		$sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e ";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
-		$sql.= " WHERE e.entity = " . $conf->entity;
-		$sql.= " AND e.fk_statut in (6)";
-		if ($y && $m)
-		{
-			$sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-			$sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-		}
-		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)."'";
-		$sql.= " AND (d.product_type = -1";
-		$sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)";       // enhance detection of service
-		if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
-		$sql.= " ORDER BY e.rowid";
-
-		if (! $sql)
-		{
-			dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
-			return -1;  // -1 = Not accountancy module enabled
-		}
-		if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-		if ($sql != 'TODO')
-		{
-			dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-			$resql = $db->query($sql);
-			if ($resql)
-			{
-				$rate = -1;
-				$oldrowid='';
-				while($assoc = $db->fetch_array($resql))
-				{
-					// Code to avoid warnings when array entry not defined
-					if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
-					if (! isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat']=0;
-					if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
-					if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
-
-					if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-					{
-						$oldrowid=$assoc['rowid'];
-						$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
+    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,";
+        $sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
+        $sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
+        $sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
+        $sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
+        $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e ";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
+        $sql.= " WHERE e.entity = " . $conf->entity;
+        $sql.= " AND e.fk_statut in (6)";
+        if ($y && $m)
+        {
+            $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+            $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+        }
+        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)."'";
+        $sql.= " AND (d.product_type = -1";
+        $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)";       // enhance detection of service
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+        $sql.= " ORDER BY e.rowid";
+
+        if (! $sql)
+        {
+            dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
+            return -1;  // -1 = Not accountancy module enabled
+        }
+        if ($sql == 'TODO') return -2; // -2 = Feature not yet available
+        if ($sql != 'TODO')
+        {
+            dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $rate = -1;
+                $oldrowid='';
+                while($assoc = $db->fetch_array($resql))
+                {
+                    // Code to avoid warnings when array entry not defined
+                    if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
+                    if (! isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat']=0;
+                    if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
+                    if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
+
+                    if ($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'];
-						$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
-					}
-
-					$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
-					$list[$assoc['rate']]['dtype'][] = 'ExpenseReportPayment';
-					$list[$assoc['rate']]['datef'][] = $assoc['datef'];
-					$list[$assoc['rate']]['company_name'][] = '';
-					$list[$assoc['rate']]['company_id'][] = '';
-					$list[$assoc['rate']]['user_id'][] = $assoc['fk_user_author'];
-					$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-					$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
-
-					$list[$assoc['rate']]['facid'][] = $assoc['facid'];
-					$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-					$list[$assoc['rate']]['type'][] = $assoc['type'];
-					$list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-					$list[$assoc['rate']]['descr'][] = $assoc['descr'];
-
-					$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
-					$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
-					$list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
-					$list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
-
-					$list[$assoc['rate']]['pid'][] = $assoc['pid'];
-					$list[$assoc['rate']]['pref'][] = $assoc['pref'];
-					$list[$assoc['rate']]['ptype'][] = 'ExpenseReportPayment';
-
-					$list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
-					$list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
-
-					$rate = $assoc['rate'];
-				}
-			}
-			else
-			{
-				dol_print_error($db);
-				return -3;
-			}
-		}
-	}
-
-	return $list;
+                        $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
+                        $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
+                    }
+
+                    $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
+                    $list[$assoc['rate']]['dtype'][] = 'ExpenseReportPayment';
+                    $list[$assoc['rate']]['datef'][] = $assoc['datef'];
+                    $list[$assoc['rate']]['company_name'][] = '';
+                    $list[$assoc['rate']]['company_id'][] = '';
+                    $list[$assoc['rate']]['user_id'][] = $assoc['fk_user_author'];
+                    $list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+                    $list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+                    $list[$assoc['rate']]['facid'][] = $assoc['facid'];
+                    $list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
+                    $list[$assoc['rate']]['type'][] = $assoc['type'];
+                    $list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+                    $list[$assoc['rate']]['descr'][] = $assoc['descr'];
+
+                    $list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
+                    $list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
+                    $list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
+                    $list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
+
+                    $list[$assoc['rate']]['pid'][] = $assoc['pid'];
+                    $list[$assoc['rate']]['pref'][] = $assoc['pref'];
+                    $list[$assoc['rate']]['ptype'][] = 'ExpenseReportPayment';
+
+                    $list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
+                    $list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
+
+                    $rate = $assoc['rate'];
+                }
+            }
+            else
+            {
+                dol_print_error($db);
+                return -3;
+            }
+        }
+    }
+
+    return $list;
 }
 

Spacing +381 added lines, -381 removed lines

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

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

Indentation +49 added lines, -49 removed lines

@@ -55,11 +55,11 @@ 
 
     // Input search_htmlname is original field
     // Input htmlname is a second input field used when using ajax autocomplete.
-	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />';
+    $script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />';
 
-	$script.= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n";
-	$script.= '<script type="text/javascript">'."\n";
-	$script.= '$(document).ready(function() {
+    $script.= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n";
+    $script.= '<script type="text/javascript">'."\n";
+    $script.= '$(document).ready(function() {
 					var autoselect = '.$autoselect.';
 					var options = '.json_encode($ajaxoptions).';
 
@@ -202,9 +202,9 @@ 
 					};
 
   				});';
-	$script.= '</script>';
+    $script.= '</script>';
 
-	return $script;
+    return $script;
 }
 
 /**
@@ -223,9 +223,9 @@ 
  */
 function ajax_multiautocompleter($htmlname, $fields, $url, $option='', $minLength=2, $autoselect=0)
 {
-	$script = '<!-- Autocomplete -->'."\n";
-	$script.= '<script type="text/javascript">';
-	$script.= 'jQuery(document).ready(function() {
+    $script = '<!-- Autocomplete -->'."\n";
+    $script.= '<script type="text/javascript">';
+    $script.= 'jQuery(document).ready(function() {
 					var fields = '.json_encode($fields).';
 					var nboffields = fields.length;
 					var autoselect = '.$autoselect.';
@@ -314,9 +314,9 @@ 
     					}
 					});
   				});';
-	$script.= '</script>';
+    $script.= '</script>';
 
-	return $script;
+    return $script;
 }
 
 /**
@@ -330,12 +330,12 @@ 
  */
 function ajax_dialog($title,$message,$w=350,$h=150)
 {
-	global $langs;
+    global $langs;
 
-	$newtitle=dol_textishtml($title)?dol_string_nohtmltag($title,1):$title;
-	$msg= '<div id="dialog-info" title="'.dol_escape_htmltag($newtitle).'">';
-	$msg.= $message;
-	$msg.= '</div>'."\n";
+    $newtitle=dol_textishtml($title)?dol_string_nohtmltag($title,1):$title;
+    $msg= '<div id="dialog-info" title="'.dol_escape_htmltag($newtitle).'">';
+    $msg.= $message;
+    $msg.= '</div>'."\n";
     $msg.= '<script type="text/javascript">
     jQuery(function() {
         jQuery("#dialog-info").dialog({
@@ -373,17 +373,17 @@ 
  */
 function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve')
 {
-	global $conf;
+    global $conf;
 
-	// 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 '';
+    // 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->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,12 +410,12 @@ 
 					},
 					dropdownCssClass: \'ui-dialog\'
 				})';
-	if ($forcefocus) $msg.= '.select2(\'focus\')';
-	$msg.= ';'."\n";
+    if ($forcefocus) $msg.= '.select2(\'focus\')';
+    $msg.= ';'."\n";
 
-	if (is_array($events) && count($events))    // If an array of js events to do were provided.
-	{
-		$msg.= '
+    if (is_array($events) && count($events))    // If an array of js events to do were provided.
+    {
+        $msg.= '
 			jQuery("#'.$htmlname.'").change(function () {
 				var obj = '.json_encode($events).';
 		   		$.each(obj, function(key,values) {
@@ -462,9 +462,9 @@ 
 						}
 				);
 			}';
-	}
+    }
 
-	$msg.= '});'."\n";
+    $msg.= '});'."\n";
     $msg.= "</script>\n";
 
     return $msg;
@@ -482,18 +482,18 @@ 
  */
 function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, $strict=0)
 {
-	global $conf, $langs;
-
-	$entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity);
-
-	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
-	{
-		$out= "\n<!-- Ajax code to switch constant ".$code." -->".'
+    global $conf, $langs;
+
+    $entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity);
+
+    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
+    {
+        $out= "\n<!-- Ajax code to switch constant ".$code." -->".'
 		<script type="text/javascript">
 			$(document).ready(function() {
 				var input = '.json_encode($input).';
@@ -528,13 +528,13 @@ 
 			});
 		</script>'."\n";
 
-		$out.= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>';
-		$out.= '<span id="set_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'hideobject':'').'">'.($revertonoff?img_picto($langs->trans("Enabled"),'switch_on'):img_picto($langs->trans("Disabled"),'switch_off')).'</span>';
-		$out.= '<span id="del_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'':'hideobject').'">'.($revertonoff?img_picto($langs->trans("Disabled"),'switch_off'):img_picto($langs->trans("Enabled"),'switch_on')).'</span>';
-		$out.="\n";
-	}
+        $out.= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>';
+        $out.= '<span id="set_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'hideobject':'').'">'.($revertonoff?img_picto($langs->trans("Enabled"),'switch_on'):img_picto($langs->trans("Disabled"),'switch_off')).'</span>';
+        $out.= '<span id="del_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'':'hideobject').'">'.($revertonoff?img_picto($langs->trans("Disabled"),'switch_off'):img_picto($langs->trans("Enabled"),'switch_on')).'</span>';
+        $out.="\n";
+    }
 
-	return $out;
+    return $out;
 }
 
 /**

Spacing +49 added lines, -49 removed lines

@@ -43,23 +43,23 @@ 
  *                                      - Ex: array('option_disabled'=> id to disable and warning to show if we select a disabled value (this is possible when using autocomplete ajax)
  *	@return string              		Script
  */
-function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array())
+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';
+    $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.
 	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />';
 
-	$script.= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n";
-	$script.= '<script type="text/javascript">'."\n";
-	$script.= '$(document).ready(function() {
+	$script .= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n";
+	$script .= '<script type="text/javascript">'."\n";
+	$script .= '$(document).ready(function() {
 					var autoselect = '.$autoselect.';
 					var options = '.json_encode($ajaxoptions).';
 
@@ -109,7 +109,7 @@ 
                     });
     				$("input#search_'.$htmlname.'").autocomplete({
     					source: function( request, response ) {
-    						$.get("'.$url.($urloption?'?'.$urloption:'').'", { '.$htmlname.': request.term }, function(data){
+    						$.get("'.$url.($urloption ? '?'.$urloption : '').'", { '.$htmlname.': request.term }, function(data){
 								if (data != null)
 								{
 									response($.map( data, function(item) {
@@ -133,7 +133,7 @@ 
 										return { label: label, value: item.value, id: item.key, update: update, textarea: textarea, disabled: item.disabled }
 									}));
 								}
-								else console.error("Error: Ajax url '.$url.($urloption?'?'.$urloption:'').' has returned an empty page. Should be an empty json array.");
+								else console.error("Error: Ajax url '.$url.($urloption ? '?'.$urloption : '').' has returned an empty page. Should be an empty json array.");
 							}, "json");
 						},
 						dataType: "json",
@@ -202,7 +202,7 @@ 
 					};
 
   				});';
-	$script.= '</script>';
+	$script .= '</script>';
 
 	return $script;
 }
@@ -221,11 +221,11 @@ 
  *	@param	int		$autoselect			Automatic selection if just one value
  *	@return string              		Script
  */
-function ajax_multiautocompleter($htmlname, $fields, $url, $option='', $minLength=2, $autoselect=0)
+function ajax_multiautocompleter($htmlname, $fields, $url, $option = '', $minLength = 2, $autoselect = 0)
 {
 	$script = '<!-- Autocomplete -->'."\n";
-	$script.= '<script type="text/javascript">';
-	$script.= 'jQuery(document).ready(function() {
+	$script .= '<script type="text/javascript">';
+	$script .= 'jQuery(document).ready(function() {
 					var fields = '.json_encode($fields).';
 					var nboffields = fields.length;
 					var autoselect = '.$autoselect.';
@@ -235,7 +235,7 @@ 
     					dataType: "json",
     					minLength: '.$minLength.',
     					source: function( request, response ) {
-    						jQuery.getJSON( "'.$url.($option?'?'.$option:'').'", { '.$htmlname.': request.term }, function(data){
+    						jQuery.getJSON( "'.$url.($option ? '?'.$option : '').'", { '.$htmlname.': request.term }, function(data){
 								response( jQuery.map( data, function( item ) {
 									if (autoselect == 1 && data.length == 1) {
 										jQuery("#'.$htmlname.'").val(item.value);
@@ -314,7 +314,7 @@ 
     					}
 					});
   				});';
-	$script.= '</script>';
+	$script .= '</script>';
 
 	return $script;
 }
@@ -328,15 +328,15 @@ 
  *	@param	int		$h			height of dialog box
  *	@return	void
  */
-function ajax_dialog($title,$message,$w=350,$h=150)
+function ajax_dialog($title, $message, $w = 350, $h = 150)
 {
 	global $langs;
 
-	$newtitle=dol_textishtml($title)?dol_string_nohtmltag($title,1):$title;
-	$msg= '<div id="dialog-info" title="'.dol_escape_htmltag($newtitle).'">';
-	$msg.= $message;
-	$msg.= '</div>'."\n";
-    $msg.= '<script type="text/javascript">
+	$newtitle = dol_textishtml($title) ?dol_string_nohtmltag($title, 1) : $title;
+	$msg = '<div id="dialog-info" title="'.dol_escape_htmltag($newtitle).'">';
+	$msg .= $message;
+	$msg .= '</div>'."\n";
+    $msg .= '<script type="text/javascript">
     jQuery(function() {
         jQuery("#dialog-info").dialog({
 	        resizable: false,
@@ -352,7 +352,7 @@ 
 	});
 	</script>';
 
-    $msg.= "\n";
+    $msg .= "\n";
 
     return $msg;
 }
@@ -371,25 +371,25 @@ 
  * @return	string								Return html string to convert a select field into a combo, or '' if feature has been disabled for some reason.
  * @see selectArrayAjax of html.form.class
  */
-function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve')
+function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete = 0, $forcefocus = 0, $widthTypeOfAutocomplete = 'resolve')
 {
 	global $conf;
 
 	// 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->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_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.' -->
+    $tmpplugin = 'select2';
+    $msg = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
           <script type="text/javascript">
         	$(document).ready(function () {
-        		$(\''.(preg_match('/^\./',$htmlname)?$htmlname:'#'.$htmlname).'\').'.$tmpplugin.'({
+        		$(\''.(preg_match('/^\./', $htmlname) ? $htmlname : '#'.$htmlname).'\').'.$tmpplugin.'({
         		    dir: \'ltr\',
         			width: \''.$widthTypeOfAutocomplete.'\',		/* off or resolve */
 					minimumInputLength: '.$minLengthToAutocomplete.',
@@ -410,12 +410,12 @@ 
 					},
 					dropdownCssClass: \'ui-dialog\'
 				})';
-	if ($forcefocus) $msg.= '.select2(\'focus\')';
-	$msg.= ';'."\n";
+	if ($forcefocus) $msg .= '.select2(\'focus\')';
+	$msg .= ';'."\n";
 
 	if (is_array($events) && count($events))    // If an array of js events to do were provided.
 	{
-		$msg.= '
+		$msg .= '
 			jQuery("#'.$htmlname.'").change(function () {
 				var obj = '.json_encode($events).';
 		   		$.each(obj, function(key,values) {
@@ -464,8 +464,8 @@ 
 			}';
 	}
 
-	$msg.= '});'."\n";
-    $msg.= "</script>\n";
+	$msg .= '});'."\n";
+    $msg .= "</script>\n";
 
     return $msg;
 }
@@ -480,7 +480,7 @@ 
  *  @param	bool	$strict			Use only "disabled" with delConstant and "enabled" with setConstant
  * 	@return	string
  */
-function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, $strict=0)
+function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0)
 {
 	global $conf, $langs;
 
@@ -488,12 +488,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>';
+		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." -->".'
+		$out = "\n<!-- Ajax code to switch constant ".$code." -->".'
 		<script type="text/javascript">
 			$(document).ready(function() {
 				var input = '.json_encode($input).';
@@ -528,10 +528,10 @@ 
 			});
 		</script>'."\n";
 
-		$out.= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>';
-		$out.= '<span id="set_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'hideobject':'').'">'.($revertonoff?img_picto($langs->trans("Enabled"),'switch_on'):img_picto($langs->trans("Disabled"),'switch_off')).'</span>';
-		$out.= '<span id="del_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'':'hideobject').'">'.($revertonoff?img_picto($langs->trans("Disabled"),'switch_off'):img_picto($langs->trans("Enabled"),'switch_on')).'</span>';
-		$out.="\n";
+		$out .= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>';
+		$out .= '<span id="set_'.$code.'" class="linkobject '.(!empty($conf->global->$code) ? 'hideobject' : '').'">'.($revertonoff ?img_picto($langs->trans("Enabled"), 'switch_on') : img_picto($langs->trans("Disabled"), 'switch_off')).'</span>';
+		$out .= '<span id="del_'.$code.'" class="linkobject '.(!empty($conf->global->$code) ? '' : 'hideobject').'">'.($revertonoff ?img_picto($langs->trans("Disabled"), 'switch_off') : img_picto($langs->trans("Enabled"), 'switch_on')).'</span>';
+		$out .= "\n";
 	}
 
 	return $out;
@@ -548,11 +548,11 @@ 
  *  @param  array   $input      Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))
  *  @return string              html for button on/off
  */
-function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input=array())
+function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input = array())
 {
     global $langs;
 
-    $out= '<script type="text/javascript">
+    $out = '<script type="text/javascript">
         $(function() {
             var input = '.json_encode($input).';
 
@@ -617,8 +617,8 @@ 
             });
         });
     </script>';
-    $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans($text_off),'switch_off').'</span>';
-    $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans($text_on),'switch_on').'</span>';
+    $out .= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? 'hideobject' : '').'">'.img_picto($langs->trans($text_off), 'switch_off').'</span>';
+    $out .= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? '' : 'hideobject').'">'.img_picto($langs->trans($text_on), 'switch_on').'</span>';
 
     return $out;
 }

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

Indentation +203 added lines, -203 removed lines

@@ -50,234 +50,234 @@
  */
 function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate=0, $filesuffix='', $paymentbankid='', $thirdpartiesid='', $fileprefix='mergedpdf')
 {
-	$sql = "SELECT DISTINCT f.rowid, f.ref";
-	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-	$sqlwhere='';
-	$sqlorder='';
-	if (in_array('all',$filter))
-	{
-		$sqlorder = " ORDER BY f.ref ASC";
-	}
-	if (in_array('date',$filter))
-	{
-		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)."'";
-		$sqlorder = " ORDER BY f.datef ASC";
-	}
-	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";
-		$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";
-		$sqlwhere.= " f.fk_statut > 0";
-		$sqlwhere.= " AND f.rowid = pf.fk_facture";
-		$sqlwhere.= " AND pf.fk_paiement = p.rowid";
-		if (in_array('payments',$filter))
-		{
-			$sqlwhere.= " AND p.datep >= '".$db->idate($paymentdateafter)."'";
-			$sqlwhere.= " AND p.datep <= '".$db->idate($paymentdatebefore)."'";
-		}
-		if (in_array('bank',$filter))
-		{
-			$sqlwhere.= " AND p.fk_bank = b.rowid";
-			$sqlwhere.= " AND b.fk_account = ".$paymentbankid;
-		}
-		$sqlorder = " ORDER BY p.datep ASC";
-	}
-	if (in_array('nodeposit',$filter))
-	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 3';
-	}
-	if (in_array('noreplacement',$filter))
-	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 1';
-	}
-	if (in_array('nocreditnote',$filter))
-	{
-	    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";
-	    $sqlwhere.=' f.fk_soc NOT IN ('.join(',',$thirdpartiesid).')';
-	}
-	if (in_array('onlythirdparties',$filter) && is_array($thirdpartiesid))
-	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' f.fk_soc IN ('.join(',',$thirdpartiesid).')';
-	}
-	if ($sqlwhere) $sql.=$sqlwhere;
-	if ($sqlorder) $sql.=$sqlorder;
+    $sql = "SELECT DISTINCT f.rowid, f.ref";
+    $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
+    $sqlwhere='';
+    $sqlorder='';
+    if (in_array('all',$filter))
+    {
+        $sqlorder = " ORDER BY f.ref ASC";
+    }
+    if (in_array('date',$filter))
+    {
+        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)."'";
+        $sqlorder = " ORDER BY f.datef ASC";
+    }
+    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";
+        $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";
+        $sqlwhere.= " f.fk_statut > 0";
+        $sqlwhere.= " AND f.rowid = pf.fk_facture";
+        $sqlwhere.= " AND pf.fk_paiement = p.rowid";
+        if (in_array('payments',$filter))
+        {
+            $sqlwhere.= " AND p.datep >= '".$db->idate($paymentdateafter)."'";
+            $sqlwhere.= " AND p.datep <= '".$db->idate($paymentdatebefore)."'";
+        }
+        if (in_array('bank',$filter))
+        {
+            $sqlwhere.= " AND p.fk_bank = b.rowid";
+            $sqlwhere.= " AND b.fk_account = ".$paymentbankid;
+        }
+        $sqlorder = " ORDER BY p.datep ASC";
+    }
+    if (in_array('nodeposit',$filter))
+    {
+        if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+        else $sqlwhere.=" AND";
+        $sqlwhere.=' type <> 3';
+    }
+    if (in_array('noreplacement',$filter))
+    {
+        if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+        else $sqlwhere.=" AND";
+        $sqlwhere.=' type <> 1';
+    }
+    if (in_array('nocreditnote',$filter))
+    {
+        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";
+        $sqlwhere.=' f.fk_soc NOT IN ('.join(',',$thirdpartiesid).')';
+    }
+    if (in_array('onlythirdparties',$filter) && is_array($thirdpartiesid))
+    {
+        if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+        else $sqlwhere.=" AND";
+        $sqlwhere.=' f.fk_soc IN ('.join(',',$thirdpartiesid).')';
+    }
+    if ($sqlwhere) $sql.=$sqlwhere;
+    if ($sqlorder) $sql.=$sqlorder;
 
-	//print $sql; exit;
-	dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG);
+    //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();
+    // Start of transaction
+    //$db->begin();
 
-	$error = 0;
-	$result = 0;
-	$files = array() ;		// liste les fichiers
+    $error = 0;
+    $result = 0;
+    $files = array() ;		// liste les fichiers
 
-	dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG);
-	if ( $resql=$db->query($sql) )
-	{
-	    $num = $db->num_rows($resql);
-	    $cpt = 0;
-	    $oldemail = '';
-	    $message = '';
-	    $total = '';
+    dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG);
+    if ( $resql=$db->query($sql) )
+    {
+        $num = $db->num_rows($resql);
+        $cpt = 0;
+        $oldemail = '';
+        $message = '';
+        $total = '';
 
-	    if ($num)
-	    {
-	    	// First loop on each resultset to build PDF
-	    	// -----------------------------------------
+        if ($num)
+        {
+            // First loop on each resultset to build PDF
+            // -----------------------------------------
 
-	        while ($cpt < $num)
-	        {
-	            $obj = $db->fetch_object($resql);
+            while ($cpt < $num)
+            {
+                $obj = $db->fetch_object($resql);
 
-				$fac = new Facture($db);
-				$result=$fac->fetch($obj->rowid);
-				if ($result > 0)
-				{
-					$outputlangs = $langs;
-					if (! empty($newlangid))
-					{
-						if ($outputlangs->defaultlang != $newlangid)
-						{
-							$outputlangs = new Translate("",$conf);
-							$outputlangs->setDefaultLang($newlangid);
-						}
-					}
-					$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";
-	    				$result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs);
-					}
-					else {
-					    if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
-					}
+                $fac = new Facture($db);
+                $result=$fac->fetch($obj->rowid);
+                if ($result > 0)
+                {
+                    $outputlangs = $langs;
+                    if (! empty($newlangid))
+                    {
+                        if ($outputlangs->defaultlang != $newlangid)
+                        {
+                            $outputlangs = new Translate("",$conf);
+                            $outputlangs->setDefaultLang($newlangid);
+                        }
+                    }
+                    $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";
+                        $result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs);
+                    }
+                    else {
+                        if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
+                    }
 
-					// Add file into files array
-					$files[] = $filename;
-				}
+                    // Add file into files array
+                    $files[] = $filename;
+                }
 
-				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 ($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);
+                }
 
-	            $cpt++;
-	        }
+                $cpt++;
+            }
 
 
-	        // Define format of output PDF
-	        $formatarray=pdf_getFormat($langs);
-	        $page_largeur = $formatarray['width'];
-	        $page_hauteur = $formatarray['height'];
-	        $format = array($page_largeur,$page_hauteur);
+            // Define format of output PDF
+            $formatarray=pdf_getFormat($langs);
+            $page_largeur = $formatarray['width'];
+            $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
-			//---------------------------------------------------------
+            // Now, build a merged files with all files in $files array
+            //---------------------------------------------------------
 
-	        // Create empty PDF
-	        $pdf=pdf_getInstance($format);
-	        if (class_exists('TCPDF'))
-	        {
-	            $pdf->setPrintHeader(false);
-	            $pdf->setPrintFooter(false);
-	        }
-	        $pdf->SetFont(pdf_getPDFFont($langs));
+            // Create empty PDF
+            $pdf=pdf_getInstance($format);
+            if (class_exists('TCPDF'))
+            {
+                $pdf->setPrintHeader(false);
+                $pdf->setPrintFooter(false);
+            }
+            $pdf->SetFont(pdf_getPDFFont($langs));
 
-	        if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
-			//$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);
+            // 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);
 
-				// Charge un document PDF depuis un fichier.
-				$pagecount = $pdf->setSourceFile($file);
-				for ($i = 1; $i <= $pagecount; $i++)
-	            {
-	                 $tplidx = $pdf->importPage($i);
-	                 $s = $pdf->getTemplatesize($tplidx);
-	                 $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-	                 $pdf->useTemplate($tplidx);
-	            }
-			}
+                // Charge un document PDF depuis un fichier.
+                $pagecount = $pdf->setSourceFile($file);
+                for ($i = 1; $i <= $pagecount; $i++)
+                {
+                        $tplidx = $pdf->importPage($i);
+                        $s = $pdf->getTemplatesize($tplidx);
+                        $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+                        $pdf->useTemplate($tplidx);
+                }
+            }
 
-			// Create output dir if not exists
-			dol_mkdir($diroutputpdf);
+            // Create output dir if not exists
+            dol_mkdir($diroutputpdf);
 
-			// Save merged file
-			$filename=$fileprefix;
-			if (empty($filename)) $filename='mergedpdf';
-			if (! empty($filesuffix)) $filename.='_'.$filesuffix;
-			$file=$diroutputpdf.'/'.$filename.'.pdf';
+            // Save merged file
+            $filename=$fileprefix;
+            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 (! $error && $pagecount)
+            {
+                $pdf->Output($file,'F');
+                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 ($usestdout)
+            {
+                if (! $error) print "Merged PDF has been built in ".$file."\n";
+                else print "Can't build PDF ".$file."\n";
+            }
 
-			$result = 1;
-	    }
-	    else
-	    {
-	        if ($usestdout) print "No invoices found for criteria.\n";
-	        else dol_syslog("No invoices found for criteria");
-	        $result = 0;
-	    }
-	}
-	else
-	{
-	    dol_print_error($db);
-	    dol_syslog("scripts/invoices/rebuild_merge.php: Error");
-	    $error++;
-	}
+            $result = 1;
+        }
+        else
+        {
+            if ($usestdout) print "No invoices found for criteria.\n";
+            else dol_syslog("No invoices found for criteria");
+            $result = 0;
+        }
+    }
+    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;
 }
 

Spacing +77 added lines, -77 removed lines

@@ -48,86 +48,86 @@ 
  * @param	string		$fileprefix				Prefix to add into filename of generated PDF
  * @return	int									Error code
  */
-function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate=0, $filesuffix='', $paymentbankid='', $thirdpartiesid='', $fileprefix='mergedpdf')
+function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate = 0, $filesuffix = '', $paymentbankid = '', $thirdpartiesid = '', $fileprefix = 'mergedpdf')
 {
 	$sql = "SELECT DISTINCT f.rowid, f.ref";
-	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-	$sqlwhere='';
-	$sqlorder='';
-	if (in_array('all',$filter))
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+	$sqlwhere = '';
+	$sqlorder = '';
+	if (in_array('all', $filter))
 	{
 		$sqlorder = " ORDER BY f.ref ASC";
 	}
-	if (in_array('date',$filter))
+	if (in_array('date', $filter))
 	{
-		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)."'";
+		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)."'";
 		$sqlorder = " ORDER BY f.datef ASC";
 	}
-	if (in_array('nopayment',$filter))
+	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";
-		$sqlwhere.= " f.fk_statut > 0";
-		$sqlwhere.= " AND pf.fk_paiement IS NULL";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
+		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))
+	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";
-		$sqlwhere.= " f.fk_statut > 0";
-		$sqlwhere.= " AND f.rowid = pf.fk_facture";
-		$sqlwhere.= " AND pf.fk_paiement = p.rowid";
-		if (in_array('payments',$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";
+		$sqlwhere .= " f.fk_statut > 0";
+		$sqlwhere .= " AND f.rowid = pf.fk_facture";
+		$sqlwhere .= " AND pf.fk_paiement = p.rowid";
+		if (in_array('payments', $filter))
 		{
-			$sqlwhere.= " AND p.datep >= '".$db->idate($paymentdateafter)."'";
-			$sqlwhere.= " AND p.datep <= '".$db->idate($paymentdatebefore)."'";
+			$sqlwhere .= " AND p.datep >= '".$db->idate($paymentdateafter)."'";
+			$sqlwhere .= " AND p.datep <= '".$db->idate($paymentdatebefore)."'";
 		}
-		if (in_array('bank',$filter))
+		if (in_array('bank', $filter))
 		{
-			$sqlwhere.= " AND p.fk_bank = b.rowid";
-			$sqlwhere.= " AND b.fk_account = ".$paymentbankid;
+			$sqlwhere .= " AND p.fk_bank = b.rowid";
+			$sqlwhere .= " AND b.fk_account = ".$paymentbankid;
 		}
 		$sqlorder = " ORDER BY p.datep ASC";
 	}
-	if (in_array('nodeposit',$filter))
+	if (in_array('nodeposit', $filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 3';
+	    if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+	    else $sqlwhere .= " AND";
+	    $sqlwhere .= ' type <> 3';
 	}
-	if (in_array('noreplacement',$filter))
+	if (in_array('noreplacement', $filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 1';
+	    if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+	    else $sqlwhere .= " AND";
+	    $sqlwhere .= ' type <> 1';
 	}
-	if (in_array('nocreditnote',$filter))
+	if (in_array('nocreditnote', $filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 2';
+	    if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+	    else $sqlwhere .= " AND";
+	    $sqlwhere .= ' type <> 2';
 	}
-	if (in_array('excludethirdparties',$filter) && is_array($thirdpartiesid))
+	if (in_array('excludethirdparties', $filter) && is_array($thirdpartiesid))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' f.fk_soc NOT IN ('.join(',',$thirdpartiesid).')';
+	    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 (in_array('onlythirdparties', $filter) && is_array($thirdpartiesid))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' f.fk_soc IN ('.join(',',$thirdpartiesid).')';
+	    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);
@@ -139,10 +139,10 @@ 
 
 	$error = 0;
 	$result = 0;
-	$files = array() ;		// liste les fichiers
+	$files = array(); // liste les fichiers
 
 	dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG);
-	if ( $resql=$db->query($sql) )
+	if ($resql = $db->query($sql))
 	{
 	    $num = $db->num_rows($resql);
 	    $cpt = 0;
@@ -160,23 +160,23 @@ 
 	            $obj = $db->fetch_object($resql);
 
 				$fac = new Facture($db);
-				$result=$fac->fetch($obj->rowid);
+				$result = $fac->fetch($obj->rowid);
 				if ($result > 0)
 				{
 					$outputlangs = $langs;
-					if (! empty($newlangid))
+					if (!empty($newlangid))
 					{
 						if ($outputlangs->defaultlang != $newlangid)
 						{
-							$outputlangs = new Translate("",$conf);
+							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlangid);
 						}
 					}
-					$filename=$conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf';
-					if ($regenerate || ! dol_is_file($filename))
+					$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";
-	    				$result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs);
+	    				$result = $fac->generateDocument($regenerate ? $regenerate : $fac->modelpdf, $outputlangs);
 					}
 					else {
 					    if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
@@ -189,8 +189,8 @@ 
 				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++;
@@ -198,20 +198,20 @@ 
 
 
 	        // Define format of output PDF
-	        $formatarray=pdf_getFormat($langs);
+	        $formatarray = pdf_getFormat($langs);
 	        $page_largeur = $formatarray['width'];
 	        $page_hauteur = $formatarray['height'];
-	        $format = array($page_largeur,$page_hauteur);
+	        $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
 			//---------------------------------------------------------
 
 	        // Create empty PDF
-	        $pdf=pdf_getInstance($format);
+	        $pdf = pdf_getInstance($format);
 	        if (class_exists('TCPDF'))
 	        {
 	            $pdf->setPrintHeader(false);
@@ -223,7 +223,7 @@ 
 			//$pdf->SetCompression(false);
 
 			// Add all others
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
 	            if ($usestdout) print "Merge PDF file for invoice ".$file."\n";
 	            else dol_syslog("Merge PDF file for invoice ".$file);
@@ -243,21 +243,21 @@ 
 			dol_mkdir($diroutputpdf);
 
 			// Save merged file
-			$filename=$fileprefix;
-			if (empty($filename)) $filename='mergedpdf';
-			if (! empty($filesuffix)) $filename.='_'.$filesuffix;
-			$file=$diroutputpdf.'/'.$filename.'.pdf';
+			$filename = $fileprefix;
+			if (empty($filename)) $filename = 'mergedpdf';
+			if (!empty($filesuffix)) $filename .= '_'.$filesuffix;
+			$file = $diroutputpdf.'/'.$filename.'.pdf';
 
-			if (! $error && $pagecount)
+			if (!$error && $pagecount)
 			{
-				$pdf->Output($file,'F');
-				if (! empty($conf->global->MAIN_UMASK))
+				$pdf->Output($file, 'F');
+				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";
+				if (!$error) print "Merged PDF has been built in ".$file."\n";
 				else print "Can't build PDF ".$file."\n";
 			}
 

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;
+	}
+	}
 

dolibarr/htdocs/core/lib/prelevement.lib.php

Indentation +24 added lines, -24 removed lines

@@ -33,31 +33,31 @@ 
  */
 function prelevement_prepare_head(BonPrelevement $object)
 {
-	global $langs, $conf, $user;
-	$langs->load("withdrawals");
+    global $langs, $conf, $user;
+    $langs->load("withdrawals");
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'prelevement';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'prelevement';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Bills");
-	$head[$h][2] = 'invoices';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Bills");
+    $head[$h][2] = 'invoices';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-rejet.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Rejects");
-	$head[$h][2] = 'rejects';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-rejet.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Rejects");
+    $head[$h][2] = 'rejects';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-stat.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Statistics");
-	$head[$h][2] = 'statistics';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-stat.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Statistics");
+    $head[$h][2] = 'statistics';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -77,10 +77,10 @@ 
  */
 function prelevement_check_config()
 {
-	global $conf;
-	if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
-	if(empty($conf->global->PRELEVEMENT_ICS)) return -1;
+    global $conf;
+    if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
+    if(empty($conf->global->PRELEVEMENT_ICS)) return -1;
     if(empty($conf->global->PRELEVEMENT_USER)) return -1;
-	return 0;
+    return 0;
 }
 

Spacing +5 added lines, -5 removed lines

@@ -63,9 +63,9 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'prelevement');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'prelevement');
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'prelevement','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'prelevement', 'remove');
 
     return $head;
 }
@@ -78,9 +78,9 @@ 
 function prelevement_check_config()
 {
 	global $conf;
-	if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
-	if(empty($conf->global->PRELEVEMENT_ICS)) return -1;
-    if(empty($conf->global->PRELEVEMENT_USER)) return -1;
+	if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
+	if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
+    if (empty($conf->global->PRELEVEMENT_USER)) return -1;
 	return 0;
 }
 

Braces +9 added lines, -3 removed lines

@@ -78,9 +78,15 @@
 function prelevement_check_config()
 {
 	global $conf;
-	if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
-	if(empty($conf->global->PRELEVEMENT_ICS)) return -1;
-    if(empty($conf->global->PRELEVEMENT_USER)) return -1;
+	if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) {
+	    return -1;
+	}
+	if(empty($conf->global->PRELEVEMENT_ICS)) {
+	    return -1;
+	}
+    if(empty($conf->global->PRELEVEMENT_USER)) {
+        return -1;
+    }
 	return 0;
 }
 

dolibarr/htdocs/core/lib/barcode.lib.php

Indentation +8 added lines, -8 removed lines

@@ -226,8 +226,8 @@ 
     return array(
         "error" => '',
         "encoding" => $encoding,
-		"bars" => $line,
-		"text" => $text
+        "bars" => $line,
+        "text" => $text
     );
 }
 
@@ -271,16 +271,16 @@ 
     }
     //var_dump($bars);
     $ret=array(
-		"bars" => trim($bars),
-		"text" => trim($text),
-		"encoding" => trim($encoding),
-    	"error" => ""
+        "bars" => trim($bars),
+        "text" => trim($text),
+        "encoding" => trim($encoding),
+        "error" => ""
     );
     //var_dump($ret);
     if (preg_match('/permission denied/i',$ret['bars']))
     {
-    	$ret['error']=$ret['bars']; $ret['bars']='';
-    	return $ret;
+        $ret['error']=$ret['bars']; $ret['bars']='';
+        return $ret;
     }
     if (!$ret['bars']) return false;
     if (!$ret['text']) return false;

Spacing +113 added lines, -113 removed lines

@@ -27,18 +27,18 @@ 
 /* ******************************************************************** */
 /*                          COLORS                                      */
 /* ******************************************************************** */
-$bar_color=array(0,0,0);
-$bg_color=array(255,255,255);
-$text_color=array(0,0,0);
+$bar_color = array(0, 0, 0);
+$bg_color = array(255, 255, 255);
+$text_color = array(0, 0, 0);
 
 
 /* ******************************************************************** */
 /*                          FONT FILE                                   */
 /* ******************************************************************** */
-if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc=constant('DOL_DEFAULT_TTF_BOLD');
+if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc = constant('DOL_DEFAULT_TTF_BOLD');
 // Automatic-Detection of Font if running Windows
 // @CHANGE LDR
-if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc=$_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
+if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc = $_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
 if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');
 
 
@@ -50,7 +50,7 @@ 
 * genbarcode is needed to render encodings other than EAN-12/EAN-13/ISBN
 */
 
-if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc=constant('PHP-BARCODE_PATH_COMMAND');
+if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc = constant('PHP-BARCODE_PATH_COMMAND');
 else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
 
 
@@ -65,20 +65,20 @@ 
  * @param	string	       $mode		'png' or 'jpg' ...
  * @return	array|string   $bars		array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info) or string with error message
  */
-function barcode_print($code, $encoding="ANY", $scale = 2 ,$mode = "png")
+function barcode_print($code, $encoding = "ANY", $scale = 2, $mode = "png")
 {
     dol_syslog("barcode.lib.php::barcode_print $code $encoding $scale $mode");
 
-    $bars=barcode_encode($code,$encoding);
-    if (! $bars || ! empty($bars['error']))
+    $bars = barcode_encode($code, $encoding);
+    if (!$bars || !empty($bars['error']))
     {
         // Return error message instead of array
-        if (empty($bars['error'])) $error='Bad Value '.$code.' for encoding '.$encoding;
-        else $error=$bars['error'];
+        if (empty($bars['error'])) $error = 'Bad Value '.$code.' for encoding '.$encoding;
+        else $error = $bars['error'];
         dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR);
         return $error;
     }
-    if (! $mode) $mode="png";
+    if (!$mode) $mode = "png";
     //if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);
     //elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);
     //else
@@ -108,7 +108,7 @@ 
  * @param	string	$encoding	Encoding
  * @return	array				array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info)
  */
-function barcode_encode($code,$encoding)
+function barcode_encode($code, $encoding)
 {
     global $genbarcode_loc;
 
@@ -116,23 +116,23 @@ 
     (preg_match("/^ean$/i", $encoding))
 
     || (($encoding) && (preg_match("/^isbn$/i", $encoding))
-    && (( strlen($code)==9 || strlen($code)==10) ||
-    (((preg_match("/^978/", $code) && strlen($code)==12) ||
-    (strlen($code)==13)))))
+    && ((strlen($code) == 9 || strlen($code) == 10) ||
+    (((preg_match("/^978/", $code) && strlen($code) == 12) ||
+    (strlen($code) == 13)))))
 
-    || (( !isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding) ))
+    || ((!isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding)))
     && (preg_match("/^[0-9]{12,13}$/", $code)))
     )
     {
         /* use built-in EAN-Encoder */
         dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");
-        $bars=barcode_encode_ean($code, $encoding);
+        $bars = barcode_encode_ean($code, $encoding);
     }
     else if (file_exists($genbarcode_loc))	// For example C39
     {
         /* use genbarcode */
         dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);
-        $bars=barcode_encode_genbarcode($code, $encoding);
+        $bars = barcode_encode_genbarcode($code, $encoding);
     }
     else
     {
@@ -160,14 +160,14 @@ 
  */
 function barcode_gen_ean_sum($ean)
 {
-    $even=true; $esum=0; $osum=0;
-    $ln=strlen($ean)-1;
-    for ($i=$ln; $i>=0; $i--)
+    $even = true; $esum = 0; $osum = 0;
+    $ln = strlen($ean) - 1;
+    for ($i = $ln; $i >= 0; $i--)
     {
-        if ($even) $esum+=$ean[$i];	else $osum+=$ean[$i];
-        $even=!$even;
+        if ($even) $esum += $ean[$i]; else $osum += $ean[$i];
+        $even = !$even;
     }
-    return (10-((3*$esum+$osum)%10))%10;
+    return (10 - ((3 * $esum + $osum) % 10)) % 10;
 }
 
 /**
@@ -179,48 +179,48 @@ 
  */
 function barcode_encode_ean($ean, $encoding = "EAN-13")
 {
-    $digits=array(3211,2221,2122,1411,1132,1231,1114,1312,1213,3112);
-    $mirror=array("000000","001011","001101","001110","010011","011001","011100","010101","010110","011010");
-    $guards=array("9a1a","1a1a1","a1a");
+    $digits = array(3211, 2221, 2122, 1411, 1132, 1231, 1114, 1312, 1213, 3112);
+    $mirror = array("000000", "001011", "001101", "001110", "010011", "011001", "011100", "010101", "010110", "011010");
+    $guards = array("9a1a", "1a1a1", "a1a");
 
-    $ean=trim($ean);
-    if (preg_match("/[^0-9]/i",$ean))
+    $ean = trim($ean);
+    if (preg_match("/[^0-9]/i", $ean))
     {
         return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)");
     }
-    $encoding=strtoupper($encoding);
-    if ($encoding=="ISBN")
+    $encoding = strtoupper($encoding);
+    if ($encoding == "ISBN")
     {
-        if (!preg_match("/^978/", $ean)) $ean="978".$ean;
+        if (!preg_match("/^978/", $ean)) $ean = "978".$ean;
     }
-    if (preg_match("/^978/", $ean)) $encoding="ISBN";
-    if (strlen($ean)<12 || strlen($ean)>13)
+    if (preg_match("/^978/", $ean)) $encoding = "ISBN";
+    if (strlen($ean) < 12 || strlen($ean) > 13)
     {
         return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");
     }
 
-    $ean=substr($ean,0,12);
-    $eansum=barcode_gen_ean_sum($ean);
-    $ean.=$eansum;
-    $line=$guards[0];
-    for ($i=1;$i<13;$i++)
+    $ean = substr($ean, 0, 12);
+    $eansum = barcode_gen_ean_sum($ean);
+    $ean .= $eansum;
+    $line = $guards[0];
+    for ($i = 1; $i < 13; $i++)
     {
-        $str=$digits[$ean[$i]];
-        if ($i<7 && $mirror[$ean[0]][$i-1]==1) $line.=strrev($str); else $line.=$str;
-        if ($i==6) $line.=$guards[1];
+        $str = $digits[$ean[$i]];
+        if ($i < 7 && $mirror[$ean[0]][$i - 1] == 1) $line .= strrev($str); else $line .= $str;
+        if ($i == 6) $line .= $guards[1];
     }
-    $line.=$guards[2];
+    $line .= $guards[2];
 
     /* create text */
-    $pos=0;
-    $text="";
-    for ($a=0;$a<13;$a++)
+    $pos = 0;
+    $text = "";
+    for ($a = 0; $a < 13; $a++)
     {
-        if ($a>0) $text.=" ";
-        $text.="$pos:12:{$ean[$a]}";
-        if ($a==0) $pos+=12;
-        else if ($a==6) $pos+=12;
-        else $pos+=7;
+        if ($a > 0) $text .= " ";
+        $text .= "$pos:12:{$ean[$a]}";
+        if ($a == 0) $pos += 12;
+        else if ($a == 6) $pos += 12;
+        else $pos += 7;
     }
 
     return array(
@@ -238,30 +238,30 @@ 
  * @param	string	$encoding	Encoding
  * @return	array				array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info)
  */
-function barcode_encode_genbarcode($code,$encoding)
+function barcode_encode_genbarcode($code, $encoding)
 {
     global $genbarcode_loc;
 
     // Clean parameters
-    if (preg_match("/^ean$/i", $encoding) && strlen($code)==13) $code=substr($code,0,12);
-    if (!$encoding) $encoding="ANY";
-    $encoding=preg_replace("/[\\\|]/", "_", $encoding);
-    $code=preg_replace("/[\\\|]/", "_", $code);
+    if (preg_match("/^ean$/i", $encoding) && strlen($code) == 13) $code = substr($code, 0, 12);
+    if (!$encoding) $encoding = "ANY";
+    $encoding = preg_replace("/[\\\|]/", "_", $encoding);
+    $code = preg_replace("/[\\\|]/", "_", $code);
 
-    $command=escapeshellarg($genbarcode_loc);
+    $command = escapeshellarg($genbarcode_loc);
     //$paramclear=" \"".str_replace("\"", "\\\"",$code)."\" \"".str_replace("\"", "\\\"",strtoupper($encoding))."\"";
-    $paramclear=" ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
+    $paramclear = " ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
 
-    $fullcommandclear=$command." ".$paramclear." 2>&1";
+    $fullcommandclear = $command." ".$paramclear." 2>&1";
     //print $fullcommandclear."<br>\n";exit;
 
     dol_syslog("Run command ".$fullcommandclear);
-    $fp=popen($fullcommandclear, "r");
+    $fp = popen($fullcommandclear, "r");
     if ($fp)
     {
-        $bars=fgets($fp, 1024);
-        $text=fgets($fp, 1024);
-        $encoding=fgets($fp, 1024);
+        $bars = fgets($fp, 1024);
+        $text = fgets($fp, 1024);
+        $encoding = fgets($fp, 1024);
         pclose($fp);
     }
     else
@@ -270,16 +270,16 @@ 
         return false;
     }
     //var_dump($bars);
-    $ret=array(
+    $ret = array(
 		"bars" => trim($bars),
 		"text" => trim($text),
 		"encoding" => trim($encoding),
     	"error" => ""
     );
     //var_dump($ret);
-    if (preg_match('/permission denied/i',$ret['bars']))
+    if (preg_match('/permission denied/i', $ret['bars']))
     {
-    	$ret['error']=$ret['bars']; $ret['bars']='';
+    	$ret['error'] = $ret['bars']; $ret['bars'] = '';
     	return $ret;
     }
     if (!$ret['bars']) return false;
@@ -310,101 +310,101 @@ 
     //var_dump($font_loc);
 
     /* set defaults */
-    if ($scale<1) $scale=2;
-    $total_y=(int) $total_y;
-    if ($total_y<1) $total_y=(int) $scale * 60;
+    if ($scale < 1) $scale = 2;
+    $total_y = (int) $total_y;
+    if ($total_y < 1) $total_y = (int) $scale * 60;
     if (!$space)
-    $space=array('top'=>2*$scale,'bottom'=>2*$scale,'left'=>2*$scale,'right'=>2*$scale);
+    $space = array('top'=>2 * $scale, 'bottom'=>2 * $scale, 'left'=>2 * $scale, 'right'=>2 * $scale);
 
     /* count total width */
-    $xpos=0;
-    $width=true;
-    $ln=strlen($bars);
-    for ($i=0; $i<$ln; $i++)
+    $xpos = 0;
+    $width = true;
+    $ln = strlen($bars);
+    for ($i = 0; $i < $ln; $i++)
     {
-        $val=strtolower($bars[$i]);
+        $val = strtolower($bars[$i]);
         if ($width)
         {
-            $xpos+=$val*$scale;
-            $width=false;
+            $xpos += $val * $scale;
+            $width = false;
             continue;
         }
         if (preg_match("/[a-z]/", $val))
         {
             /* tall bar */
-            $val=ord($val)-ord('a')+1;
+            $val = ord($val) - ord('a') + 1;
         }
-        $xpos+=$val*$scale;
-        $width=true;
+        $xpos += $val * $scale;
+        $width = true;
     }
 
     /* allocate the image */
-    $total_x=( $xpos )+$space['right']+$space['right'];
-    $xpos=$space['left'];
-    if (! function_exists("imagecreate"))
+    $total_x = ($xpos) + $space['right'] + $space['right'];
+    $xpos = $space['left'];
+    if (!function_exists("imagecreate"))
     {
         print "You don't have the gd2 extension enabled<br>\n";
         return "";
     }
-    $im=imagecreate($total_x, $total_y);
+    $im = imagecreate($total_x, $total_y);
     /* create two images */
-    $col_bg=ImageColorAllocate($im,$bg_color[0],$bg_color[1],$bg_color[2]);
-    $col_bar=ImageColorAllocate($im,$bar_color[0],$bar_color[1],$bar_color[2]);
-    $col_text=ImageColorAllocate($im,$text_color[0],$text_color[1],$text_color[2]);
-    $height=round($total_y-($scale*10));
-    $height2=round($total_y-$space['bottom']);
+    $col_bg = ImageColorAllocate($im, $bg_color[0], $bg_color[1], $bg_color[2]);
+    $col_bar = ImageColorAllocate($im, $bar_color[0], $bar_color[1], $bar_color[2]);
+    $col_text = ImageColorAllocate($im, $text_color[0], $text_color[1], $text_color[2]);
+    $height = round($total_y - ($scale * 10));
+    $height2 = round($total_y - $space['bottom']);
 
     /* paint the bars */
-    $width=true;
-    $ln=strlen($bars);
-    for ($i=0; $i<$ln; $i++)
+    $width = true;
+    $ln = strlen($bars);
+    for ($i = 0; $i < $ln; $i++)
     {
-        $val=strtolower($bars[$i]);
+        $val = strtolower($bars[$i]);
         if ($width)
         {
-            $xpos+=$val*$scale;
-            $width=false;
+            $xpos += $val * $scale;
+            $width = false;
             continue;
         }
         if (preg_match("/[a-z]/", $val))
         {
             /* tall bar */
-            $val=ord($val)-ord('a')+1;
-            $h=$height2;
-        } else $h=$height;
-        imagefilledrectangle($im, $xpos, $space['top'], $xpos+($val*$scale)-1, $h, $col_bar);
-        $xpos+=$val*$scale;
-        $width=true;
+            $val = ord($val) - ord('a') + 1;
+            $h = $height2;
+        } else $h = $height;
+        imagefilledrectangle($im, $xpos, $space['top'], $xpos + ($val * $scale) - 1, $h, $col_bar);
+        $xpos += $val * $scale;
+        $width = true;
     }
 
-    $chars=explode(" ", $text);
+    $chars = explode(" ", $text);
     reset($chars);
-    while (list($n, $v)=each($chars))
+    while (list($n, $v) = each($chars))
     {
         if (trim($v))
         {
-            $inf=explode(":", $v);
-            $fontsize=$scale*($inf[1]/1.8);
-            $fontheight=$total_y-($fontsize/2.7)+2;
-            imagettftext($im, $fontsize, 0, $space['left']+($scale*$inf[0])+2, $fontheight, $col_text, $font_loc, $inf[2]);
+            $inf = explode(":", $v);
+            $fontsize = $scale * ($inf[1] / 1.8);
+            $fontheight = $total_y - ($fontsize / 2.7) + 2;
+            imagettftext($im, $fontsize, 0, $space['left'] + ($scale * $inf[0]) + 2, $fontheight, $col_text, $font_loc, $inf[2]);
         }
     }
 
     /* output the image */
-    $mode=strtolower($mode);
-    if ($mode=='jpg' || $mode=='jpeg')
+    $mode = strtolower($mode);
+    if ($mode == 'jpg' || $mode == 'jpeg')
     {
         header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
         imagejpeg($im);
     }
-    else if ($mode=='gif')
+    else if ($mode == 'gif')
     {
         header("Content-Type: image/gif; name=\"barcode.gif\"");
         imagegif($im);
     }
-    else if (! empty($filebarcode))    // To wxrite into  afile onto disk
+    else if (!empty($filebarcode))    // To wxrite into  afile onto disk
     {
-        imagepng($im,$filebarcode);
+        imagepng($im, $filebarcode);
     }
     else
     {

Braces +87 added lines, -38 removed lines

@@ -35,11 +35,17 @@ 
 /* ******************************************************************** */
 /*                          FONT FILE                                   */
 /* ******************************************************************** */
-if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc=constant('DOL_DEFAULT_TTF_BOLD');
+if (defined('DOL_DEFAULT_TTF_BOLD')) {
+    $font_loc=constant('DOL_DEFAULT_TTF_BOLD');
+}
 // Automatic-Detection of Font if running Windows
 // @CHANGE LDR
-if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc=$_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
-if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');
+if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) {
+    $font_loc=$_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
+}
+if (empty($font_loc)) {
+    die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');
+}
 
 
 /* ******************************************************************** */
@@ -50,8 +56,11 @@ 
 * genbarcode is needed to render encodings other than EAN-12/EAN-13/ISBN
 */
 
-if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc=constant('PHP-BARCODE_PATH_COMMAND');
-else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
+if (defined('PHP-BARCODE_PATH_COMMAND')) {
+    $genbarcode_loc=constant('PHP-BARCODE_PATH_COMMAND');
+} else {
+    $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
+}
 
 
 
@@ -73,12 +82,17 @@ 
     if (! $bars || ! empty($bars['error']))
     {
         // Return error message instead of array
-        if (empty($bars['error'])) $error='Bad Value '.$code.' for encoding '.$encoding;
-        else $error=$bars['error'];
+        if (empty($bars['error'])) {
+            $error='Bad Value '.$code.' for encoding '.$encoding;
+        } else {
+            $error=$bars['error'];
+        }
         dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR);
         return $error;
     }
-    if (! $mode) $mode="png";
+    if (! $mode) {
+        $mode="png";
+    }
     //if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);
     //elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);
     //else
@@ -127,14 +141,14 @@ 
         /* use built-in EAN-Encoder */
         dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");
         $bars=barcode_encode_ean($code, $encoding);
-    }
-    else if (file_exists($genbarcode_loc))	// For example C39
+    } else if (file_exists($genbarcode_loc)) {
+        // For example C39
     {
         /* use genbarcode */
         dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);
-        $bars=barcode_encode_genbarcode($code, $encoding);
     }
-    else
+        $bars=barcode_encode_genbarcode($code, $encoding);
+    } else
     {
         print "barcode_encode needs an external programm for encodings other then EAN/ISBN (code=".$code.", encoding=".$encoding.")<BR>\n";
         print "<UL>\n";
@@ -164,7 +178,11 @@ 
     $ln=strlen($ean)-1;
     for ($i=$ln; $i>=0; $i--)
     {
-        if ($even) $esum+=$ean[$i];	else $osum+=$ean[$i];
+        if ($even) {
+            $esum+=$ean[$i];
+        } else {
+            $osum+=$ean[$i];
+        }
         $even=!$even;
     }
     return (10-((3*$esum+$osum)%10))%10;
@@ -191,9 +209,13 @@ 
     $encoding=strtoupper($encoding);
     if ($encoding=="ISBN")
     {
-        if (!preg_match("/^978/", $ean)) $ean="978".$ean;
+        if (!preg_match("/^978/", $ean)) {
+            $ean="978".$ean;
+        }
+    }
+    if (preg_match("/^978/", $ean)) {
+        $encoding="ISBN";
     }
-    if (preg_match("/^978/", $ean)) $encoding="ISBN";
     if (strlen($ean)<12 || strlen($ean)>13)
     {
         return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");
@@ -206,8 +228,14 @@ 
     for ($i=1;$i<13;$i++)
     {
         $str=$digits[$ean[$i]];
-        if ($i<7 && $mirror[$ean[0]][$i-1]==1) $line.=strrev($str); else $line.=$str;
-        if ($i==6) $line.=$guards[1];
+        if ($i<7 && $mirror[$ean[0]][$i-1]==1) {
+            $line.=strrev($str);
+        } else {
+            $line.=$str;
+        }
+        if ($i==6) {
+            $line.=$guards[1];
+        }
     }
     $line.=$guards[2];
 
@@ -216,11 +244,17 @@ 
     $text="";
     for ($a=0;$a<13;$a++)
     {
-        if ($a>0) $text.=" ";
+        if ($a>0) {
+            $text.=" ";
+        }
         $text.="$pos:12:{$ean[$a]}";
-        if ($a==0) $pos+=12;
-        else if ($a==6) $pos+=12;
-        else $pos+=7;
+        if ($a==0) {
+            $pos+=12;
+        } else if ($a==6) {
+            $pos+=12;
+        } else {
+            $pos+=7;
+        }
     }
 
     return array(
@@ -243,8 +277,12 @@ 
     global $genbarcode_loc;
 
     // Clean parameters
-    if (preg_match("/^ean$/i", $encoding) && strlen($code)==13) $code=substr($code,0,12);
-    if (!$encoding) $encoding="ANY";
+    if (preg_match("/^ean$/i", $encoding) && strlen($code)==13) {
+        $code=substr($code,0,12);
+    }
+    if (!$encoding) {
+        $encoding="ANY";
+    }
     $encoding=preg_replace("/[\\\|]/", "_", $encoding);
     $code=preg_replace("/[\\\|]/", "_", $code);
 
@@ -263,8 +301,7 @@ 
         $text=fgets($fp, 1024);
         $encoding=fgets($fp, 1024);
         pclose($fp);
-    }
-    else
+    } else
     {
         dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run popen ".$fullcommandclear, LOG_ERR);
         return false;
@@ -282,9 +319,15 @@ 
     	$ret['error']=$ret['bars']; $ret['bars']='';
     	return $ret;
     }
-    if (!$ret['bars']) return false;
-    if (!$ret['text']) return false;
-    if (!$ret['encoding']) return false;
+    if (!$ret['bars']) {
+        return false;
+    }
+    if (!$ret['text']) {
+        return false;
+    }
+    if (!$ret['encoding']) {
+        return false;
+    }
     return $ret;
 }
 
@@ -310,11 +353,16 @@ 
     //var_dump($font_loc);
 
     /* set defaults */
-    if ($scale<1) $scale=2;
+    if ($scale<1) {
+        $scale=2;
+    }
     $total_y=(int) $total_y;
-    if ($total_y<1) $total_y=(int) $scale * 60;
-    if (!$space)
-    $space=array('top'=>2*$scale,'bottom'=>2*$scale,'left'=>2*$scale,'right'=>2*$scale);
+    if ($total_y<1) {
+        $total_y=(int) $scale * 60;
+    }
+    if (!$space) {
+        $space=array('top'=>2*$scale,'bottom'=>2*$scale,'left'=>2*$scale,'right'=>2*$scale);
+    }
 
     /* count total width */
     $xpos=0;
@@ -371,7 +419,9 @@ 
             /* tall bar */
             $val=ord($val)-ord('a')+1;
             $h=$height2;
-        } else $h=$height;
+        } else {
+            $h=$height;
+        }
         imagefilledrectangle($im, $xpos, $space['top'], $xpos+($val*$scale)-1, $h, $col_bar);
         $xpos+=$val*$scale;
         $width=true;
@@ -396,17 +446,16 @@ 
     {
         header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
         imagejpeg($im);
-    }
-    else if ($mode=='gif')
+    } else if ($mode=='gif')
     {
         header("Content-Type: image/gif; name=\"barcode.gif\"");
         imagegif($im);
-    }
-    else if (! empty($filebarcode))    // To wxrite into  afile onto disk
+    } else if (! empty($filebarcode)) {
+        // To wxrite into  afile onto disk
     {
         imagepng($im,$filebarcode);
     }
-    else
+    } else
     {
         header("Content-Type: image/png; name=\"barcode.png\"");
         imagepng($im);

dolibarr/htdocs/core/lib/accounting.lib.php

Indentation +54 added lines, -54 removed lines

@@ -31,25 +31,25 @@ 
  */
 function accounting_prepare_head(AccountingAccount $object)
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array ();
+    $h = 0;
+    $head = array ();
 
-	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h ++;
+    $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id=' . $object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h ++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
-	// $this->tabs = array('entity:-tabname); to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+    // $this->tabs = array('entity:-tabname); to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -60,9 +60,9 @@ 
  */
 function clean_account($account)
 {
-	$account = rtrim($account,"0");
+    $account = rtrim($account,"0");
 
-	return $account;
+    return $account;
 }
 
 /**
@@ -73,31 +73,31 @@ 
  */
 function length_accountg($account)
 {
-	global $conf;
+    global $conf;
 
-	if ($account < 0 || empty($account)) return '';
+    if ($account < 0 || empty($account)) return '';
 
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
+    if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
 
-	$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
-	if (! empty($g)) {
-		// Clean parameters
-		$i = strlen($account);
+    $g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
+    if (! empty($g)) {
+        // Clean parameters
+        $i = strlen($account);
 
-		if ($i >= 1) {
-			while ( $i < $g ) {
-				$account .= '0';
+        if ($i >= 1) {
+            while ( $i < $g ) {
+                $account .= '0';
 
-				$i ++;
-			}
+                $i ++;
+            }
 
-			return $account;
-		} else {
-			return $account;
-		}
-	} else {
-		return $account;
-	}
+            return $account;
+        } else {
+            return $account;
+        }
+    } else {
+        return $account;
+    }
 }
 
 /**
@@ -108,31 +108,31 @@ 
  */
 function length_accounta($accounta)
 {
-	global $conf, $langs;
+    global $conf, $langs;
 
-	if ($accounta < 0 || empty($accounta)) return '';
+    if ($accounta < 0 || empty($accounta)) return '';
 
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
+    if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
 
-	$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
-	if (! empty($a)) {
-		// Clean parameters
-		$i = strlen($accounta);
+    $a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
+    if (! empty($a)) {
+        // Clean parameters
+        $i = strlen($accounta);
 
-		if ($i >= 1) {
-			while ( $i < $a ) {
-				$accounta .= '0';
+        if ($i >= 1) {
+            while ( $i < $a ) {
+                $accounta .= '0';
 
-				$i ++;
-			}
+                $i ++;
+            }
 
-			return $accounta;
-		} else {
-			return $accounta;
-		}
-	} else {
-		return $accounta;
-	}
+            return $accounta;
+        } else {
+            return $accounta;
+        }
+    } else {
+        return $accounta;
+    }
 }
 
 

Spacing +20 added lines, -20 removed lines

@@ -34,12 +34,12 @@ 
 	global $langs, $conf;
 
 	$h = 0;
-	$head = array ();
+	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
-	$h ++;
+	$h++;
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
@@ -60,7 +60,7 @@ 
  */
 function clean_account($account)
 {
-	$account = rtrim($account,"0");
+	$account = rtrim($account, "0");
 
 	return $account;
 }
@@ -77,18 +77,18 @@ 
 
 	if ($account < 0 || empty($account)) return '';
 
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
+	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
 
 	$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
-	if (! empty($g)) {
+	if (!empty($g)) {
 		// Clean parameters
 		$i = strlen($account);
 
 		if ($i >= 1) {
-			while ( $i < $g ) {
+			while ($i < $g) {
 				$account .= '0';
 
-				$i ++;
+				$i++;
 			}
 
 			return $account;
@@ -112,18 +112,18 @@ 
 
 	if ($accounta < 0 || empty($accounta)) return '';
 
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
+	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
 
 	$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
-	if (! empty($a)) {
+	if (!empty($a)) {
 		// Clean parameters
 		$i = strlen($accounta);
 
 		if ($i >= 1) {
-			while ( $i < $a ) {
+			while ($i < $a) {
 				$accounta .= '0';
 
-				$i ++;
+				$i++;
 			}
 
 			return $accounta;
@@ -152,17 +152,17 @@ 
  *  @param  string              $varlink        Add a variable into the address of the page
  *	@return	void
  */
-function journalHead($nom,$variante,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='', $varlink='')
+function journalHead($nom, $variante, $period, $periodlink, $description, $builddate, $exportlink = '', $moreparam = array(), $calcmode = '', $varlink = '')
 {
     global $langs;
 
-    if (empty($hselected)) $hselected='report';
+    if (empty($hselected)) $hselected = 'report';
 
     print "\n\n<!-- debut cartouche journal -->\n";
 
-    if(! empty($varlink)) $varlink = '?'.$varlink;
+    if (!empty($varlink)) $varlink = '?'.$varlink;
 
-    $h=0;
+    $h = 0;
     $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
     $head[$h][1] = $langs->trans("Journalization");
     $head[$h][2] = 'journal';
@@ -171,7 +171,7 @@ 
 
     dol_fiche_head($head, 'journal');
 
-    foreach($moreparam as $key => $value)
+    foreach ($moreparam as $key => $value)
     {
         print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
     }
@@ -180,7 +180,7 @@ 
     // Ligne de titre
     print '<tr>';
     print '<td width="110">'.$langs->trans("Name").'</td>';
-    if (! $variantexxx) print '<td colspan="3">';
+    if (!$variantexxx) print '<td colspan="3">';
     else print '<td>';
     print $nom;
     if ($variantexxx) print '</td><td colspan="2">'.$variantexxx;
@@ -192,7 +192,7 @@ 
     {
         print '<tr>';
         print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
-        if (! $variante) print '<td colspan="3">';
+        if (!$variante) print '<td colspan="3">';
         else print '<td>';
         print $calcmode;
         if ($variante) print '</td><td colspan="2">'.$variante;
@@ -203,7 +203,7 @@ 
     // Ligne de la periode d'analyse du rapport
     print '<tr>';
     print '<td>'.$langs->trans("ReportPeriod").'</td>';
-    if (! $periodlink) print '<td colspan="3">';
+    if (!$periodlink) print '<td colspan="3">';
     else print '<td>';
     if ($period) print $period;
     if ($periodlink) print '</td><td colspan="2">'.$periodlink;

Braces +45 added lines, -16 removed lines

@@ -75,9 +75,13 @@ 
 {
 	global $conf;
 
-	if ($account < 0 || empty($account)) return '';
+	if ($account < 0 || empty($account)) {
+	    return '';
+	}
 
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
+	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+	    return $account;
+	}
 
 	$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
 	if (! empty($g)) {
@@ -110,9 +114,13 @@ 
 {
 	global $conf, $langs;
 
-	if ($accounta < 0 || empty($accounta)) return '';
+	if ($accounta < 0 || empty($accounta)) {
+	    return '';
+	}
 
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
+	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+	    return $accounta;
+	}
 
 	$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
 	if (! empty($a)) {
@@ -156,11 +164,15 @@ 
 {
     global $langs;
 
-    if (empty($hselected)) $hselected='report';
+    if (empty($hselected)) {
+        $hselected='report';
+    }
 
     print "\n\n<!-- debut cartouche journal -->\n";
 
-    if(! empty($varlink)) $varlink = '?'.$varlink;
+    if(! empty($varlink)) {
+        $varlink = '?'.$varlink;
+    }
 
     $h=0;
     $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
@@ -180,10 +192,15 @@ 
     // Ligne de titre
     print '<tr>';
     print '<td width="110">'.$langs->trans("Name").'</td>';
-    if (! $variantexxx) print '<td colspan="3">';
-    else print '<td>';
+    if (! $variantexxx) {
+        print '<td colspan="3">';
+    } else {
+        print '<td>';
+    }
     print $nom;
-    if ($variantexxx) print '</td><td colspan="2">'.$variantexxx;
+    if ($variantexxx) {
+        print '</td><td colspan="2">'.$variantexxx;
+    }
     print '</td>';
     print '</tr>';
 
@@ -192,10 +209,15 @@ 
     {
         print '<tr>';
         print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
-        if (! $variante) print '<td colspan="3">';
-        else print '<td>';
+        if (! $variante) {
+            print '<td colspan="3">';
+        } else {
+            print '<td>';
+        }
         print $calcmode;
-        if ($variante) print '</td><td colspan="2">'.$variante;
+        if ($variante) {
+            print '</td><td colspan="2">'.$variante;
+        }
         print '</td>';
         print '</tr>';
     }
@@ -203,10 +225,17 @@ 
     // Ligne de la periode d'analyse du rapport
     print '<tr>';
     print '<td>'.$langs->trans("ReportPeriod").'</td>';
-    if (! $periodlink) print '<td colspan="3">';
-    else print '<td>';
-    if ($period) print $period;
-    if ($periodlink) print '</td><td colspan="2">'.$periodlink;
+    if (! $periodlink) {
+        print '<td colspan="3">';
+    } else {
+        print '<td>';
+    }
+    if ($period) {
+        print $period;
+    }
+    if ($periodlink) {
+        print '</td><td colspan="2">'.$periodlink;
+    }
     print '</td>';
     print '</tr>';