diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index a56ba593a9c..469985679c9 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -191,7 +191,7 @@ if ($id > 0 || $ref) { print ''.$langs->trans("TransData").''; print dol_print_date($object->date_trans, 'day'); - print ' '.$langs->trans("By").' '.$muser->getFullName($langs).''; + print ' '.$langs->trans("By").' '.$muser->getNomUrl(-1).''; print ''.$langs->trans("TransMetod").''; print $object->methodes_trans[$object->method_trans]; print ''; @@ -237,7 +237,9 @@ if ($id > 0 || $ref) { if ($object->type == 'bank-transfer') { $modulepart = 'paymentbybanktransfer'; } - print ''.$relativepath.''; + print ''.$relativepath; + print img_picto('', 'download', 'class="paddingleft"'); + print ''; print ''; // Other attributes diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 8ff6a54abed..0722450a610 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -156,7 +156,9 @@ if ($id > 0 || $ref) { if ($object->type == 'bank-transfer') { $modulepart = 'paymentbybanktransfer'; } - print ''.$relativepath.''; + print ''.$relativepath; + print img_picto('', 'download', 'class="paddingleft"'); + print ''; print ''; print ''; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index febc4827a94..086b6b76ef8 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -97,7 +97,7 @@ if ($prev_id > 0 || $ref) { //print ''.$langs->trans("Ref").''.$object->getNomUrl(1).''; print ''.$langs->trans("Date").''.dol_print_date($object->datec, 'day').''; - print ''.$langs->trans("Amount").''.price($object->amount).''; + print ''.$langs->trans("Amount").''.price($object->amount).''; if ($object->date_trans <> 0) { $muser = new User($db); @@ -105,7 +105,7 @@ if ($prev_id > 0 || $ref) { print ''.$langs->trans("TransData").''; print dol_print_date($object->date_trans, 'day'); - print ' '.$langs->trans("By").' '.$muser->getFullName($langs).''; + print ' '.$langs->trans("By").' '.$muser->getNomUrl(-1).''; print ''.$langs->trans("TransMetod").''; print $object->methodes_trans[$object->method_trans]; print ''; @@ -151,7 +151,9 @@ if ($prev_id > 0 || $ref) { if ($object->type == 'bank-transfer') { $modulepart = 'paymentbybanktransfer'; } - print ''.$relativepath.''; + print ''.$relativepath; + print img_picto('', 'download', 'class="paddingleft"'); + print ''; print ''; print ''; @@ -207,7 +209,7 @@ if ($resql) { print"\n\n"; print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table - print ''; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 8255c537442..7e2b5cc6669 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -91,7 +91,7 @@ if ($prev_id > 0 || $ref) { //print ''; print ''; - print ''; + print ''; if ($object->date_trans <> 0) { $muser = new User($db); @@ -99,7 +99,7 @@ if ($prev_id > 0 || $ref) { print ''; + print ' '.$langs->trans("By").' '.$muser->getNomUrl(-1).''; print ''; @@ -145,7 +145,9 @@ if ($prev_id > 0 || $ref) { if ($object->type == 'bank-transfer') { $modulepart = 'paymentbybanktransfer'; } - print ''.$relativepath.''; + print ''.$relativepath; + print img_picto('', 'download', 'class="paddingleft"'); + print ''; print '
'.$langs->trans("Line").''.$langs->trans("ThirdParty").''.$langs->trans("Amount").''.$langs->trans("Reason").''.$langs->trans("ToBill").''.$langs->trans("Invoice").'
'.$langs->trans("Ref").''.$object->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($object->datec, 'day').'
'.$langs->trans("Amount").''.price($object->amount).'
'.$langs->trans("Amount").''.price($object->amount).'
'.$langs->trans("TransData").''; print dol_print_date($object->date_trans, 'day'); - print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; print $object->methodes_trans[$object->method_trans]; print '
'; print '
'; @@ -173,7 +175,8 @@ if ($prev_id > 0 || $ref) { print load_fiche_titre($langs->trans("StatisticsByLineStatus"), '', ''); print"\n\n"; - print ''; + print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table + print '
'; print ''; print ''; @@ -184,10 +187,13 @@ if ($prev_id > 0 || $ref) { print $line->LibStatut($row[1], 1); - print ''; - print ''; + + print '
'.$langs->trans("Status").''.$langs->trans("Amount").'%
'; - print price($row[0]); + print ''; + print ''; + print price($row[0]); + print ''; if ($object->amount) { print round($row[0] / $object->amount * 100, 2)." %"; } @@ -200,6 +206,8 @@ if ($prev_id > 0 || $ref) { } print "
"; + print ""; + $db->free($resql); } else { print $db->error().' '.$sql;