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

Look: Meilleur lisibilit de la date

Browse Source
This commit is contained in:
Laurent Destailleur 2007-10-09 21:42:16 +00:00
parent d8b5a5d2a8
commit eee02b555a
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/comm/action/index.php
View File

@ -64,7 +64,7 @@ llxHeader();
*/ */
$sql = "SELECT s.nom as societe, s.rowid as socid, s.client,"; $sql = "SELECT s.nom as societe, s.rowid as socid, s.client,";
$sql.= " a.id,".$db->pdate("a.datep")." as dp, a.fk_contact, a.note, a.label, a.percent as percent,"; $sql.= " a.id,".$db->pdate("a.datep")." as dp, ".$db->pdate("a.datea")." as da, a.fk_contact, a.note, a.label, a.percent as percent,";
$sql.= " c.code as acode, c.libelle,"; $sql.= " c.code as acode, c.libelle,";
$sql.= " u.login, u.rowid as userid,"; $sql.= " u.login, u.rowid as userid,";
$sql.= " sp.name, sp.firstname"; $sql.= " sp.name, sp.firstname";
@ -122,7 +122,8 @@ if ($resql)
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.datep",$param,'','colspan="4"',$sortfield); print_liste_field_titre($langs->trans("DatePlanShort"),$_SERVER["PHP_SELF"],"a.datep",$param,'','',$sortfield);
print_liste_field_titre($langs->trans("DateRealShort"),$_SERVER["PHP_SELF"],"a.datea",$param,'','',$sortfield);
print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"acode",$param,"","",$sortfield); print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"acode",$param,"","",$sortfield);
print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield); print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield);
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield);
@ -142,10 +143,14 @@ if ($resql)
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td align="left" colspan="4">'; print '<td align="left" nowrap="nowrap">';
print dolibarr_print_date($obj->dp,"dayhour"); print dolibarr_print_date($obj->dp,"dayhour");
print '</td>'; print '</td>';
print '<td align="left" nowrap="nowrap">';
print dolibarr_print_date($obj->da,"dayhour");
print '</td>';
// Action (type) // Action (type)
print '<td>'; print '<td>';
$actionstatic->id=$obj->id; $actionstatic->id=$obj->id;
@ -174,7 +179,7 @@ if ($resql)
$contactstatic->name=$obj->name; $contactstatic->name=$obj->name;
$contactstatic->firstname=$obj->firstname; $contactstatic->firstname=$obj->firstname;
$contactstatic->id=$obj->fk_contact; $contactstatic->id=$obj->fk_contact;
print $contactstatic->getNomUrl(1); print $contactstatic->getNomUrl(1,'',16);
} }
else else
{ {
@ -186,7 +191,7 @@ if ($resql)
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>'; print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
// Status/Percent // Status/Percent
print '<td align="right">'.$actionstatic->LibStatut($obj->percent,5).'</td>'; print '<td align="right" nowrap="nowrap">'.$actionstatic->LibStatut($obj->percent,5).'</td>';
print "</tr>\n"; print "</tr>\n";
$i++; $i++;

2
htdocs/compta/paiement/cheque/liste.php
View File

@ -123,7 +123,7 @@ if ($resql)
print '</td>'; print '</td>';
// Date // Date
print '<td align="center">'.dolibarr_print_date($objp->dp).'</td>'; print '<td align="center">'.dolibarr_print_date($objp->dp,'day').'</td>';
// Banque // Banque
print '<td>'; print '<td>';

5
htdocs/contact.class.php
View File

@ -699,10 +699,11 @@ class Contact
* \brief Renvoie nom clicable (avec eventuellement le picto) * \brief Renvoie nom clicable (avec eventuellement le picto)
* \param withpicto Inclut le picto dans le lien * \param withpicto Inclut le picto dans le lien
* \param option Sur quoi pointe le lien * \param option Sur quoi pointe le lien
* \param maxlen Longueur max libelle
* \return string Chaine avec URL * \return string Chaine avec URL
* \remarks Utilise $this->id, $this->name et $this->firstname * \remarks Utilise $this->id, $this->name et $this->firstname
*/ */
function getNomUrl($withpicto=0,$option='') function getNomUrl($withpicto=0,$option='',$maxlen=0)
{ {
global $langs; global $langs;
@ -718,7 +719,7 @@ class Contact
} }
if ($withpicto) $result.=($lien.img_object($langs->trans("ShowContact").': '.$this->name.' '.$this->firstname,'contact').$lienfin.' '); if ($withpicto) $result.=($lien.img_object($langs->trans("ShowContact").': '.$this->name.' '.$this->firstname,'contact').$lienfin.' ');
$result.=$lien.$this->name.' '.$this->firstname.$lienfin; $result.=$lien.($maxlen?dolibarr_trunc(($this->name.' '.$this->firstname),$maxlen):($this->name.' '.$this->firstname)).$lienfin;
return $result; return $result;
} }

2
htdocs/langs/en_US/main.lang
View File

@ -162,6 +162,8 @@ DateOperationShort=Ope. Date
DateLimit=Limit date DateLimit=Limit date
DateRequest=Request date DateRequest=Request date
DateProcess=Process date DateProcess=Process date
DatePlanShort=Date planed
DateRealShort=Date real.
DurationYear=year DurationYear=year
DurationMonth=month DurationMonth=month
DurationDay=day DurationDay=day

2
htdocs/langs/fr_FR/main.lang
View File

@ -163,6 +163,8 @@ DateOperationShort=Date op
DateLimit=Date limite DateLimit=Date limite
DateRequest=Date demande DateRequest=Date demande
DateProcess=Date traitement DateProcess=Date traitement
DatePlanShort=Date planif.
DateRealShort=Date réal.
DurationYear=an DurationYear=an
DurationMonth=mois DurationMonth=mois
DurationDay=jour DurationDay=jour