From 5007ef82c8487e711c50783d2f42a6c88435cb15 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 12 Feb 2019 14:56:38 +0100 Subject: [PATCH] update with html5 compliant code --- htdocs/compta/stats/byratecountry.php | 24 +++++++++---------- htdocs/compta/stats/cabyprodserv.php | 34 +++++++++++++-------------- htdocs/compta/stats/cabyuser.php | 16 ++++++------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php index dd14f175432..c69547740dc 100644 --- a/htdocs/compta/stats/byratecountry.php +++ b/htdocs/compta/stats/byratecountry.php @@ -257,10 +257,10 @@ while($i < 12) { $j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START); if ($j > 12) $j -= 12; - print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ''; + print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ''; $i++; } -print '' . $langs->trans("TotalHT") . ''; +print '' . $langs->trans("TotalHT") . ''; $sql = "SELECT fd.tva_tx AS vatrate,"; $sql .= " fd.product_type AS product_type,"; @@ -301,10 +301,10 @@ if ($resql) { $j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START); if ($j > 12) $j -= 12; $monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT); - print '' . price($obj->$monthj) . ''; + print '' . price($obj->$monthj) . ''; $totalpermonth[$j]=(empty($totalpermonth[$j])?0:$totalpermonth[$j])+$obj->$monthj; } - print '' . price($obj->total) . ''; + print '' . price($obj->total) . ''; $totalpermonth['total']=(empty($totalpermonth['total'])?0:$totalpermonth['total'])+$obj->total; print ''; } @@ -318,9 +318,9 @@ if ($resql) { $j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START); if ($j > 12) $j -= 12; $monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT); - print '' . price($totalpermonth[$j]) . ''; + print '' . price($totalpermonth[$j]) . ''; } - print '' . price($totalpermonth['total']) . ''; + print '' . price($totalpermonth['total']) . ''; print ''; } else { print $db->lasterror(); // Show last sql error @@ -335,10 +335,10 @@ while($i < 12) { $j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START); if ($j > 12) $j -= 12; - print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ''; + print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ''; $i++; } -print '' . $langs->trans("TotalHT") . ''; +print '' . $langs->trans("TotalHT") . ''; $sql2 = "SELECT ffd.tva_tx AS vatrate,"; $sql2 .= " ffd.product_type AS product_type,"; @@ -380,10 +380,10 @@ if ($resql2) { $j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START); if ($j > 12) $j -= 12; $monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT); - print '' . price($obj->$monthj) . ''; + print '' . price($obj->$monthj) . ''; $totalpermonth[$j]=(empty($totalpermonth[$j])?0:$totalpermonth[$j])+$obj->$monthj; } - print '' . price($obj->total) . ''; + print '' . price($obj->total) . ''; $totalpermonth['total']=(empty($totalpermonth['total'])?0:$totalpermonth['total'])+$obj->total; print ''; } @@ -397,9 +397,9 @@ if ($resql2) { $j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START); if ($j > 12) $j -= 12; $monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT); - print '' . price($totalpermonth[$j]) . ''; + print '' . price($totalpermonth[$j]) . ''; } - print '' . price($totalpermonth['total']) . ''; + print '' . price($totalpermonth['total']) . ''; print ''; } else { print $db->lasterror(); // Show last sql error diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index fffb63055aa..cb8a3cc451d 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -315,7 +315,7 @@ if ($modecompta == 'CREANCES-DETTES') $form->select_type_of_lines(isset($selected_type)?$selected_type:-1, 'search_type', 1, 1, 1); print ''; - print ''; + print ''; print ''; print ''; @@ -337,7 +337,7 @@ print_liste_field_titre( "qty", "", $paramslink, - 'align="right"', + 'class="right"', $sortfield, $sortorder ); @@ -347,7 +347,7 @@ print_liste_field_titre( "qty", "", $paramslink, - 'align="right"', + 'class="right"', $sortfield, $sortorder ); @@ -356,8 +356,8 @@ print_liste_field_titre( $_SERVER["PHP_SELF"], "amount", "", - $paramslink, - 'align="right"', + $classslink, + 'class="right"', $sortfield, $sortorder ); @@ -367,7 +367,7 @@ print_liste_field_titre( "amount_ttc", "", $paramslink, - 'align="right"', + 'class="right"', $sortfield, $sortorder ); @@ -377,7 +377,7 @@ print_liste_field_titre( "amount_ttc", "", $paramslink, - 'align="right"', + 'class="right"', $sortfield, $sortorder ); @@ -400,15 +400,15 @@ print_liste_field_titre( print "\n"; // Quantity - print ''; + print ''; print $qty[$key]; print ''; // Percent; - print ''.($qtytotal > 0 ? round(100 * $qty[$key] / $qtytotal, 2).'%' : ' ').''; + print ''.($qtytotal > 0 ? round(100 * $qty[$key] / $qtytotal, 2).'%' : ' ').''; // Amount w/o VAT - print ''; + print ''; /*if ($key > 0) { print ''; } else { @@ -419,7 +419,7 @@ print_liste_field_titre( print ''; // Amount with VAT - print ''; + print ''; /*if ($key > 0) { print ''; } else { @@ -430,7 +430,7 @@ print_liste_field_titre( print ''; // Percent; - print ''.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : ' ').''; + print ''.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : ' ').''; // TODO: statistics? @@ -441,11 +441,11 @@ print_liste_field_titre( // Total print ''; print ''.$langs->trans("Total").''; - print ''.$qtytotal.''; - print '100%'; - print ''.price($catotal_ht).''; - print ''.price($catotal).''; - print '100%'; + print ''.$qtytotal.''; + print '100%'; + print ''.price($catotal_ht).''; + print ''.price($catotal).''; + print '100%'; print ''; $db->free($result); diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 7bf98b80452..89552c54199 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -310,7 +310,7 @@ if ($modecompta == 'CREANCES-DETTES') { "amount_ht", "", $paramslink, - 'align="right"', + 'class="right"', $sortfield, $sortorder ); @@ -323,7 +323,7 @@ print_liste_field_titre( "amount_ttc", "", $paramslink, - 'align="right"', + 'class="right"', $sortfield, $sortorder ); @@ -332,7 +332,7 @@ print_liste_field_titre( $_SERVER["PHP_SELF"], "amount_ttc", "", $paramslink, - 'align="right"', + 'class="right"', $sortfield, $sortorder ); @@ -391,7 +391,7 @@ if (count($amount)) { print "".$linkname."\n"; // Amount w/o VAT - print ''; + print ''; if ($modecompta != 'CREANCES-DETTES') { if ($key > 0) { @@ -410,7 +410,7 @@ if (count($amount)) { print ''; // Amount with VAT - print ''; + print ''; if ($modecompta != 'CREANCES-DETTES') { if ($key > 0) { print ''; @@ -428,7 +428,7 @@ if (count($amount)) { print ''; // Percent - print ''.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : ' ').''; + print ''.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : ' ').''; // Other stats print ''; @@ -452,9 +452,9 @@ if (count($amount)) { if ($modecompta != 'CREANCES-DETTES') { print ''; } else { - print ''.price($catotal_ht).''; + print ''.price($catotal_ht).''; } - print ''.price($catotal).''; + print ''.price($catotal).''; print ' '; print ' '; print '';