diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 8970ce93ff7..a796174eeed 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -108,7 +108,8 @@ if ($resql) $i = 0; print ""; print ''; - print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.datea","&status=$status",'','colspan="4"',$sortfield); +// print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.datea","&status=$status",'','colspan="4"',$sortfield); + print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.datea","&status=$status",'','',$sortfield); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent","&status=$status","","",$sortfield); print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"acode","&status=$status","","",$sortfield); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","&status=$status","","",$sortfield); @@ -125,28 +126,38 @@ if ($resql) print ""; + print ''; } else { - print "\n"; + print strftime("%Y",$obj->da)."-"; $oldyear = strftime("%Y",$obj->da); } - if ($oldmonth == strftime("%Y%b",$obj->da) ) + if ($oldmonth == strftime("%Y%m",$obj->da) ) { - print ''; } else { - print "\n"; - $oldmonth = strftime("%Y%b",$obj->da); + print strftime("%m",$obj->da)."-"; + $oldmonth = strftime("%Y%m",$obj->da); } - print "\n"; - print "\n"; + if ($oldday == strftime("%Y%m%d",$obj->da) ) + { + } + else + { + print strftime("%d",$obj->da)." "; + $oldday = strftime("%Y%m%d",$obj->da); + } + + print strftime("%H:%M",$obj->da); + print "\n"; + +// print '\n"; // Status/Percent if ($obj->percent < 100) { @@ -168,7 +179,7 @@ if ($resql) if ($obj->client == 1) $url=DOL_URL_ROOT.'/comm/fiche.php?socid='; elseif ($obj->client == 2) $url=DOL_URL_ROOT.'/comm/prospect/fiche.php?id='; else $url=DOL_URL_ROOT.'/soc.php?socid='; - print ' '.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->societe,32).''; + print ' '.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->societe,24).''; // Contact print '
'; if ($oldyear == strftime("%Y",$obj->da) ) { - print ' " .strftime("%Y",$obj->da)." " .strftime("%b",$obj->da)."" .strftime("%d",$obj->da)."" .strftime("%H:%M",$obj->da)."'.dolibarr_print_date($obj->da)."'; @@ -176,7 +187,7 @@ if ($resql) { $cont = new Contact($db); $cont->fetch($obj->fk_contact); - print ''.img_object($langs->trans("ShowContact"),"contact").' '.dolibarr_trunc($cont->fullname,32).''; + print ''.img_object($langs->trans("ShowContact"),"contact").' '.dolibarr_trunc($cont->fullname,24).''; } else {