From 614c52b2c06e45f83956f3de3acd90e738282210 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 16 May 2008 02:35:13 +0000 Subject: [PATCH] Fix: Bad sort order --- htdocs/lib/company.lib.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index c98a5dbcf9d..031df2beae1 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -378,7 +378,7 @@ function show_actions_done($conf,$langs,$db,$objsoc) $sql = "SELECT a.id, a.label,"; $sql.= " ".$db->pdate("a.datep")." as dp,"; - $sql.= " ".$db->pdate("a.datea")." as da,"; + $sql.= " ".$db->pdate("a.datep2")." as dp2,"; $sql.= " a.percent,"; $sql.= " a.propalrowid, a.fk_facture, a.fk_user_author, a.fk_contact,"; $sql.= " c.code as acode, c.libelle,"; @@ -389,7 +389,7 @@ function show_actions_done($conf,$langs,$db,$objsoc) $sql.= " WHERE a.fk_soc = ".$objsoc->id; $sql.= " AND u.rowid = a.fk_user_author"; $sql.= " AND c.id=a.fk_action AND a.percent = 100"; - $sql.= " ORDER BY a.datea DESC, a.id DESC"; + $sql.= " ORDER BY a.datep2 DESC, a.id DESC"; dolibarr_syslog("comm/fiche.php sql=".$sql); $result=$db->query($sql); @@ -409,12 +409,12 @@ function show_actions_done($conf,$langs,$db,$objsoc) print ""; // Champ date - print ''.strftime("%Y",$obj->dp)."\n"; - $oldyear = strftime("%Y",$obj->dp); - print ''.strftime("%b",$obj->dp)."\n"; - $oldmonth = strftime("%Y%b",$obj->dp); - print ''.strftime("%d",$obj->dp)."\n"; - print ''.strftime("%H:%M",$obj->dp)."\n"; + print ''.strftime("%Y",$obj->dp2)."\n"; + $oldyear = strftime("%Y",$obj->dp2); + print ''.strftime("%b",$obj->dp2)."\n"; + $oldmonth = strftime("%Y%b",$obj->dp2); + print ''.strftime("%d",$obj->dp2)."\n"; + print ''.strftime("%H:%M",$obj->dp2)."\n"; // Picto print ' ';