From 766cb6cf647cda916778e05740c253a3d246236d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 10 Aug 2009 17:28:07 +0000
Subject: [PATCH] Fix: Wrong order

---
 htdocs/lib/project.lib.php    | 19 ++++++++++---------
 htdocs/project.class.php      |  4 ++--
 htdocs/projet/tasks/index.php |  4 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php
index a2e567cdc7f..d6147505987 100644
--- a/htdocs/lib/project.lib.php
+++ b/htdocs/lib/project.lib.php
@@ -249,19 +249,13 @@ function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject=1, &$taskro
 
 	for ($i = 0 ; $i < sizeof($lines) ; $i++)
 	{
-		// Process line $lines[$i]
-
 		if ($parent == 0) $level = 0;
 
+		// Process line
+		// print "i:".$i."-".$lines[$i]->projectid.'<br>';
+
 		if ($lines[$i]->fk_parent == $parent)
 		{
-			// Break on a new project
-			if ($parent == 0 && $lines[$i]->projectid != $lastprojectid)
-			{
-				$var = !$var;
-				$lastprojectid=$lines[$i]->projectid;
-			}
-
 			// Show task line.
 			$showline=1;
 			$showlineingray=0;
@@ -289,6 +283,13 @@ function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject=1, &$taskro
 
 			if ($showline)
 			{
+				// Break on a new project
+				if ($parent == 0 && $lines[$i]->projectid != $lastprojectid)
+				{
+					$var = !$var;
+					$lastprojectid=$lines[$i]->projectid;
+				}
+
 				print "<tr ".$bc[$var].">\n";
 
 				// Ref of task
diff --git a/htdocs/project.class.php b/htdocs/project.class.php
index de970751464..a86c9e04a6b 100644
--- a/htdocs/project.class.php
+++ b/htdocs/project.class.php
@@ -518,9 +518,9 @@ class Project extends CommonObject
 			if ($this->id) $sql .= " AND t.fk_projet =".$this->id;
 			if (is_object($usert)) $sql .= " AND t.fk_projet = p.rowid AND ta.fk_projet_task = t.rowid AND ta.fk_user = ".$usert->id;
 			if (is_object($userp)) $sql .= " AND (p.fk_user_resp = ".$userp->id." OR p.fk_user_resp IS NULL OR p.fk_user_resp = -1)";
-			$sql.= " ORDER BY p.ref, t.title";
 		}
-		
+		$sql.= " ORDER BY p.ref, t.title";
+
 		dol_syslog("Project::getTasksArray sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php
index 32dc8b2d5a1..b3dee5d4b7b 100644
--- a/htdocs/projet/tasks/index.php
+++ b/htdocs/projet/tasks/index.php
@@ -96,8 +96,8 @@ print '<td>'.$langs->trans("LabelTask").'</td>';
 print '<td>'.$langs->trans("Project").'</td>';
 print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
 print "</tr>\n";
-// Show all lines in taskarray (recusrive function to go down on tree)
-$j=0;
+// Show all lines in taskarray (recursive function to go down on tree)
+$j=0; $level=0;
 $nboftaskshown=PLines($j, 0, $tasksarray, $level, true, 1, $tasksrole);
 print "</table>";