diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index ef20b5117a0..4e2c4e2d3a5 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -75,14 +75,14 @@ print ''; print ''; print ''; -print ''; print ''; -print '
'.$langs->trans("Statistics").'
'.$langs->trans("NbOfInvoiceToWithdraw").''; +print ''; print ''; print $bprev->NbFactureAPrelever(); print ''; print '
'.$langs->trans("AmountToWithdraw").''; +print ''; print price($bprev->SommeAPrelever(), '', '', 1, -1, -1, 'auto'); print '

'; @@ -137,15 +137,15 @@ if ($resql) print $thirdpartystatic->getNomUrl(1, 'customer'); print ''; - print ''; + print ''; print price($obj->amount); print ''; - print ''; + print ''; print dol_print_date($db->jdate($obj->date_demande), 'day'); print ''; - print ''; + print ''; print $invoicestatic->getLibStatut(3, $alreadypayed); print ''; print ''; @@ -186,8 +186,8 @@ if ($result) print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; while ($i < min($num, $limit)) @@ -204,8 +204,8 @@ if ($result) print $bprev->getNomUrl(1); print "\n"; print '\n"; - print '\n"; - print '\n"; + print '\n"; + print '\n"; print "\n"; $i++; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 977134f103f..33728093ec1 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -292,7 +292,7 @@ if ($id) print"\n\n"; print '
'.$langs->trans("LastWithdrawalReceipt", $limit).''.$langs->trans("Date").''.$langs->trans("Amount").''.$langs->trans("Status").''.$langs->trans("Amount").''.$langs->trans("Status").'
'.dol_print_date($db->jdate($obj->datec), "dayhour")."'.price($obj->amount)."'.$bprev->getLibStatut(3)."'.price($obj->amount)."'.$bprev->getLibStatut(3)."
'; print ''; - print ''; + print ''; print ''; $total = 0; @@ -312,9 +312,9 @@ if ($id) print '\n"; - print '\n"; + print '\n"; - print '\n"; diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index 3c8b461a8fc..8180517a2e8 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -146,7 +146,7 @@ if ($result) print ''; print ''; print ''; - print ''; @@ -159,7 +159,7 @@ if ($result) print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom"); print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", '', '', 'align="center"'); print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", "", 'align="center"'); - print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", "", 'align="right"'); + print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", "", 'class="right"'); print_liste_field_titre(''); print "\n"; @@ -194,7 +194,7 @@ if ($result) print '\n"; - print '\n"; + print '\n"; print ''; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index b7ca5d02bf3..9bd00ae0ce2 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -91,8 +91,8 @@ if ($resql) print"\n\n"; print '
'.$langs->trans("Invoice").''.$langs->trans("ThirdParty").''.$langs->trans("Amount").''.$langs->trans("Status").''.$langs->trans("Invoice").''.$langs->trans("ThirdParty").''.$langs->trans("Amount").''.$langs->trans("Status").'
'; print img_object($langs->trans("ShowCompany"), "company"). ' '.$obj->name."'.price($obj->total_ttc)."'.price($obj->total_ttc)."'; + print ''; $invoicestatic->fetch($obj->facid); print $invoicestatic->getLibStatut(5); print "  '; + print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print '
'.dol_print_date($db->jdate($obj->datec), 'day')."'.price($obj->amount)."'.price($obj->amount)." 
'; print ''; - print ''; - print ''; + print ''; + print ''; while ($i < $num) { @@ -105,24 +105,24 @@ if ($resql) print ''; $i++; } - print ''; - print ''; + print ''; + print ''; print "
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
'; print $row[1]; - print ''; + print ''; print round($row[1]/$nbtotal*100, 2)." %"; - print ''; + print ''; print price($row[0]); - print ''; + print ''; print round($row[0]/$total*100, 2)." %"; print '
'.$langs->trans("Total").''.$nbtotal.' '; + print '
'.$langs->trans("Total").''.$nbtotal.' '; print price($total); - print '  
"; $db->free(); } @@ -185,7 +185,7 @@ if ($resql) print ''; print ''; print ''; - print ''; + print ''; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; $Rejet = new RejetPrelevement($db, $user); @@ -199,13 +199,13 @@ if ($resql) print ''; @@ -213,10 +213,10 @@ if ($resql) $i++; } - print ''; - print ''; + print ''; + print ''; print "
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
%'.$langs->trans("Amount").'%
'.$row[1]; - print ''; + print ''; print round($row[1]/$nbtotal*100, 2)." %"; - print ''; + print ''; print price($row[0]); - print ''; + print ''; print round($row[0]/$total*100, 2)." %"; print '
'.$langs->trans("Total").''.$nbtotal.' '; + print '
'.$langs->trans("Total").''.$nbtotal.' '; print price($total); - print '  
"; $db->free($resql); }