diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 05e86c5c2f8..677887959cd 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -64,7 +64,7 @@ llxHeader(); */ $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.= " u.login, u.rowid as userid,"; $sql.= " sp.name, sp.firstname"; @@ -122,7 +122,8 @@ if ($resql) $i = 0; print "
| '; + print ' | '; print dolibarr_print_date($obj->dp,"dayhour"); print ' | '; + print ''; + print dolibarr_print_date($obj->da,"dayhour"); + print ' | '; + // Action (type) print ''; $actionstatic->id=$obj->id; @@ -174,7 +179,7 @@ if ($resql) $contactstatic->name=$obj->name; $contactstatic->firstname=$obj->firstname; $contactstatic->id=$obj->fk_contact; - print $contactstatic->getNomUrl(1); + print $contactstatic->getNomUrl(1,'',16); } else { @@ -186,7 +191,7 @@ if ($resql) print ' | '.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.' | '; // Status/Percent - print ''.$actionstatic->LibStatut($obj->percent,5).' | '; + print ''.$actionstatic->LibStatut($obj->percent,5).' | '; print "'.dolibarr_print_date($objp->dp).' | '; + print ''.dolibarr_print_date($objp->dp,'day').' | '; // Banque print ''; diff --git a/htdocs/contact.class.php b/htdocs/contact.class.php index 319a3b02652..426c8d06661 100644 --- a/htdocs/contact.class.php +++ b/htdocs/contact.class.php @@ -699,10 +699,11 @@ class Contact * \brief Renvoie nom clicable (avec eventuellement le picto) * \param withpicto Inclut le picto dans le lien * \param option Sur quoi pointe le lien + * \param maxlen Longueur max libelle * \return string Chaine avec URL * \remarks Utilise $this->id, $this->name et $this->firstname */ - function getNomUrl($withpicto=0,$option='') + function getNomUrl($withpicto=0,$option='',$maxlen=0) { global $langs; @@ -718,7 +719,7 @@ class Contact } 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; } diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index afdc9c9b738..d73eda94016 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -162,6 +162,8 @@ DateOperationShort=Ope. Date DateLimit=Limit date DateRequest=Request date DateProcess=Process date +DatePlanShort=Date planed +DateRealShort=Date real. DurationYear=year DurationMonth=month DurationDay=day diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index b8a42998a17..7f83c2c9585 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -163,6 +163,8 @@ DateOperationShort=Date op DateLimit=Date limite DateRequest=Date demande DateProcess=Date traitement +DatePlanShort=Date planif. +DateRealShort=Date réal. DurationYear=an DurationMonth=mois DurationDay=jour |