diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index d2752399025..28fb6c57fac 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -724,7 +724,7 @@ if ($socidp > 0) $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.datep DESC, a.id DESC"; $result=$db->query($sql); if ($result) diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 31ff0b51574..ff5c14ec54d 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -362,12 +362,12 @@ if ( $societe->fetch($socid) ) print '
| '.$langs->trans("ActionsToDo").' | ||||||||||
| | | '; } else { - print ''.strftime("%Y",$obj->da)." | \n"; - $oldyear = strftime("%Y",$obj->da); + print ''.strftime("%Y",$obj->dp)." | \n"; + $oldyear = strftime("%Y",$obj->dp); } - if ($oldmonth == strftime("%Y%b",$obj->da) ) + if ($oldmonth == strftime("%Y%b",$obj->dp) ) { print '| | '; } else { - print '' .strftime("%b",$obj->da)." | \n"; - $oldmonth = strftime("%Y%b",$obj->da); + print '' .strftime("%b",$obj->dp)." | \n"; + $oldmonth = strftime("%Y%b",$obj->dp); } - print ''.strftime("%d",$obj->da)." | \n"; - print ''.strftime("%H:%M",$obj->da).' | '; + print ''.strftime("%d",$obj->dp)." | \n"; + print ''.strftime("%H:%M",$obj->dp).' | '; // Picto warning print ''; - if (date("U",$obj->da) < time()) print ' '.img_warning("Late"); + if (date("U",$obj->dp) < time()) print ' '.img_warning("Late"); else print ' '; print ' | ';