lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Bad sort order

Browse Source
This commit is contained in:
Laurent Destailleur 2008-05-16 02:35:13 +00:00
parent 5eb12a3bff
commit 614c52b2c0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/lib/company.lib.php
View File

@ -378,7 +378,7 @@ function show_actions_done($conf,$langs,$db,$objsoc)
$sql = "SELECT a.id, a.label,"; $sql = "SELECT a.id, a.label,";
$sql.= " ".$db->pdate("a.datep")." as dp,"; $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.percent,";
$sql.= " a.propalrowid, a.fk_facture, a.fk_user_author, a.fk_contact,"; $sql.= " a.propalrowid, a.fk_facture, a.fk_user_author, a.fk_contact,";
$sql.= " c.code as acode, c.libelle,"; $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.= " WHERE a.fk_soc = ".$objsoc->id;
$sql.= " AND u.rowid = a.fk_user_author"; $sql.= " AND u.rowid = a.fk_user_author";
$sql.= " AND c.id=a.fk_action AND a.percent = 100"; $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); dolibarr_syslog("comm/fiche.php sql=".$sql);
$result=$db->query($sql); $result=$db->query($sql);
@ -409,12 +409,12 @@ function show_actions_done($conf,$langs,$db,$objsoc)
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
// Champ date // Champ date
print '<td width="30" align="center">'.strftime("%Y",$obj->dp)."</td>\n"; print '<td width="30" align="center">'.strftime("%Y",$obj->dp2)."</td>\n";
$oldyear = strftime("%Y",$obj->dp); $oldyear = strftime("%Y",$obj->dp2);
print '<td width="30" align="center">'.strftime("%b",$obj->dp)."</td>\n"; print '<td width="30" align="center">'.strftime("%b",$obj->dp2)."</td>\n";
$oldmonth = strftime("%Y%b",$obj->dp); $oldmonth = strftime("%Y%b",$obj->dp2);
print '<td width="20">'.strftime("%d",$obj->dp)."</td>\n"; print '<td width="20">'.strftime("%d",$obj->dp2)."</td>\n";
print '<td width="30">'.strftime("%H:%M",$obj->dp)."</td>\n"; print '<td width="30">'.strftime("%H:%M",$obj->dp2)."</td>\n";
// Picto // Picto
print '<td width="16">&nbsp;</td>'; print '<td width="16">&nbsp;</td>';