From 890abd28d54945614617275b4f5c366c69ca2513 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 9 Jan 2019 12:26:49 +0100 Subject: [PATCH] Fix look and feel v9 --- htdocs/compta/bank/ligne.php | 18 ++++++++++++++---- .../compta/paiement/class/paiement.class.php | 4 +++- htdocs/fourn/class/paiementfourn.class.php | 6 +++++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 4b9f55f025f..dd734bf3316 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -341,16 +341,26 @@ if ($result) { if ($key) print '
'; if ($links[$key]['type']=='payment') { - print ''; + require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; + $paymenttmp=new Paiement($db); + $paymenttmp->fetch($links[$key]['url_id']); + $paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref; + /*print ''; print img_object($langs->trans('ShowPayment'),'payment').' '; print $langs->trans("Payment"); - print ''; + print '';*/ + print $paymenttmp->getNomUrl(1); } else if ($links[$key]['type']=='payment_supplier') { - print ''; + require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; + $paymenttmp=new PaiementFourn($db); + $paymenttmp->fetch($links[$key]['url_id']); + $paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref; + /*print ''; print img_object($langs->trans('ShowPayment'),'payment').' '; print $langs->trans("Payment"); - print ''; + print '';*/ + print $paymenttmp->getNomUrl(1); } else if ($links[$key]['type']=='company') { $societe=new Societe($db); diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index a712d90b29c..5fa9f68c454 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -1139,7 +1139,9 @@ class Paiement extends CommonObject if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips $result=''; - $label = $langs->trans("ShowPayment").': '.$this->ref; + $label = ''.$langs->trans("ShowPayment").'
'; + $label.= ''.$langs->trans("Ref").': '.$this->ref; + $label.= '
'.$langs->trans("Date").': '.dol_print_date($this->date, 'dayhour'); if ($mode == 'withlistofinvoices') { $arraybill = $this->getBillsArray(); diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 0d62d35b385..e82c490c885 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -572,13 +572,17 @@ class PaiementFourn extends Paiement global $langs; $result=''; + $text=$this->ref; // Sometimes ref contains label if (preg_match('/^\((.*)\)$/i',$text,$reg)) { // Label generique car entre parentheses. On l'affiche en le traduisant if ($reg[1]=='paiement') $reg[1]='Payment'; $text=$langs->trans($reg[1]); } - $label = $langs->trans("ShowPayment").': '.$text; + + $label = ''.$langs->trans("ShowPayment").'
'; + $label.= ''.$langs->trans("Ref").': '.$text; + $label.= '
'.$langs->trans("Date").': '.dol_print_date($this->date, 'dayhour'); $linkstart = ''; $linkend = '';