diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 16b9da7ba51..714de9aeebd 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -3295,18 +3295,16 @@ class FactureFournisseur extends CommonInvoice $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; $return .= ''; - if (property_exists($this, 'socid')) { - $return .= ' | '.$this->socid.''; + if (!empty($arraydata['thirdparty'])) { + $return .= '
'.$arraydata['thirdparty'].''; } - if (property_exists($this, 'date_echeance') && property_exists($this, 'date')) { - if (!empty($this->date_echeance)) { - $return .= '
'.dol_print_date($this->date_echeance).''; - } else { - $return .= '
'.dol_print_date($this->date).''; - } + if (property_exists($this, 'date')) { + $return .= '
'.dol_print_date($this->date, 'day').''; } if (property_exists($this, 'total_ht')) { - $return .= '
'.$langs->trans("AmountHT").' : '.price($this->total_ht).''; + $return .= '   '.price($this->total_ht); + $return .= ' '.$langs->trans("HT"); + $return .= ''; } if (method_exists($this, 'getLibStatut')) { $alreadypaid = (empty($arraydata['alreadypaid']) ? 0 : $arraydata['alreadypaid']); diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 5302d5de3b2..878cca686e8 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -1513,7 +1513,7 @@ while ($i < $imaxinloop) { } } - $arraydata = array('alreadypaid' => $paiement); + $arraydata = array('alreadypaid' => $paiement, 'thirdparty' => $thirdparty->getNomUrl(1, '', 12)); print $facturestatic->getKanbanView('', $arraydata); if ($i == ($imaxinloop - 1)) { print '
';