From 80968440622d25fa9dabe983252c92103b974746 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 18 Jan 2019 10:10:39 +0100 Subject: [PATCH] update with html5 compliant code --- htdocs/compta/cashcontrol/cashcontrol_list.php | 4 ++-- htdocs/compta/cashcontrol/report.php | 4 ++-- htdocs/compta/charges/index.php | 12 ++++++------ htdocs/compta/facture/fiche-rec.php | 2 +- htdocs/compta/facture/invoicetemplate_list.php | 4 ++-- htdocs/compta/facture/list.php | 4 ++-- htdocs/compta/facture/prelevement.php | 6 +++--- htdocs/compta/facture/stats/index.php | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php index 11c14218440..e6358fcb5eb 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_list.php +++ b/htdocs/compta/cashcontrol/cashcontrol_list.php @@ -521,8 +521,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } else print ''; } diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php index 749d112f711..51f3c096f56 100644 --- a/htdocs/compta/cashcontrol/report.php +++ b/htdocs/compta/cashcontrol/report.php @@ -240,8 +240,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } elseif ($totalarray['totaldebfield'] == $i) print ''.price(-1 * $totalarray['totaldeb']).''; elseif ($totalarray['totalcredfield'] == $i) print ''.price($totalarray['totalcred']).''; diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 86e963e50df..c77805a4a73 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -294,7 +294,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print ''; - print ''.dol_print_date($db->jdate($obj->dm),'day').''."\n"; + print ''.dol_print_date($db->jdate($obj->dm),'day').''."\n"; print "".$obj->label."\n"; @@ -303,7 +303,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) // Ref payment $tva_static->id=$obj->rowid; $tva_static->ref=$obj->rowid; - print ''.$tva_static->getNomUrl(1)."\n"; + print ''.$tva_static->getNomUrl(1)."\n"; // Date print ''.dol_print_date($db->jdate($obj->dm),'day')."\n"; @@ -423,14 +423,14 @@ while($j<$numlt) $total = $total + $obj->amount; print ''; - print ''.dol_print_date($db->jdate($obj->dm),'day').''."\n"; + print ''.dol_print_date($db->jdate($obj->dm),'day').''."\n"; print "".$obj->label."\n"; // Ref payment $tva_static->id=$obj->rowid; $tva_static->ref=$obj->rowid; - print ''.$tva_static->getNomUrl(1)."\n"; + print ''.$tva_static->getNomUrl(1)."\n"; print ''.dol_print_date($db->jdate($obj->dp),'day')."\n"; print ''.price($obj->amount).""; @@ -508,14 +508,14 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) print ''; - print ''.dol_print_date($db->jdate($obj->dateep),'day').''."\n"; + print ''.dol_print_date($db->jdate($obj->dateep),'day').''."\n"; print "".$obj->label."\n"; // Ref payment $sal_static->id=$obj->rowid; $sal_static->ref=$obj->rowid; - print ''.$sal_static->getNomUrl(1)."\n"; + print ''.$sal_static->getNomUrl(1)."\n"; // Date print ''.dol_print_date($db->jdate($obj->datep),'day')."\n"; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 3733247f9e5..c048737b156 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -1476,7 +1476,7 @@ else print ''; print " ".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency?$object->unit_frequency:'m')); print ''; - print ''; + print ''; print ''; } else diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php index c28b0917e1e..be372e8a570 100644 --- a/htdocs/compta/facture/invoicetemplate_list.php +++ b/htdocs/compta/facture/invoicetemplate_list.php @@ -688,8 +688,8 @@ if ($resql) { if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } else print ''; } diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index b730ce98625..7a06e6f66df 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -1202,8 +1202,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).''; elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).''; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 907d2357950..07e8678e447 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -575,7 +575,7 @@ if ($object->id > 0) print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -607,7 +607,7 @@ if ($object->id > 0) $obj = $db->fetch_object($result_sql); print ''; - print '\n"; + print '\n"; print ''; print ''; print ''; @@ -657,7 +657,7 @@ if ($object->id > 0) print ''; - print '\n"; + print '\n"; print ''; diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index cbf147a8dff..0b0520b4737 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -255,7 +255,7 @@ print '
'; print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '
'; // Status - print '
'.$langs->trans("DateRequest").''.$langs->trans("DateRequest").''.$langs->trans("User").''.$langs->trans("Amount").''.$langs->trans("WithdrawalReceipt").'
'.dol_print_date($db->jdate($obj->date_demande),'day')."'.dol_print_date($db->jdate($obj->date_demande),'day')."'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''.price($obj->amount).'-
'.dol_print_date($db->jdate($obj->date_demande),'day')."'.dol_print_date($db->jdate($obj->date_demande),'day')."'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'
'.$langs->trans("Status").''; + print '
'.$langs->trans("Status").''; if ($mode == 'customer') { $liststatus=array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));