';
- $return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'';
- if (property_exists($this, 'fk_project') && !empty($this->fk_project)) {
- $return .= ' |
'.$this->fk_project.'';
+ $return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(0) : $this->ref).'';
+ if (property_exists($this, 'label')) {
+ $return .= '
'.$this->label.'
';
}
if (property_exists($this, 'date_ech')) {
- $return .= '
'.$langs->trans("DateEnd").':
'.dol_print_date($this->date_ech).'';
+ $return .= '
'.$langs->trans("DateEnd").' :
'.dol_print_date($this->date_ech, 'day').'';
}
if (property_exists($this, 'amount')) {
- $return .= '
'.$langs->trans("Amount").' :
'.price($this->amount).'';
+ $return .= '
';
+ $return .= '
'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'';
}
if (method_exists($this, 'LibStatut')) {
$return .= '
'.$this->LibStatut($this->paye, 5, $this->alreadypaid).'
';
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 5ac7f8c30de..c60dbaa7e5b 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -880,9 +880,13 @@ class MyObject extends CommonObject
$return .= img_picto('', $this->picto);
$return .= '';
$return .= '
';
- $return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'';
+ $return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'';
if (property_exists($this, 'label')) {
- $return .= '
'.$this->label.'';
+ $return .= '
'.$this->label.'
';
+ }
+ if (property_exists($this, 'amount')) {
+ $return .= '
';
+ $return .= '
'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'';
}
if (method_exists($this, 'getLibStatut')) {
$return .= '
'.$this->getLibStatut(5).'
';