From f7a28328edea147c9f97e3cbe9d4cf6066832983 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 12 Feb 2019 15:40:16 +0100 Subject: [PATCH] update with html5 compliant code --- htdocs/compta/tva/clients.php | 82 +++++++++++++++++------------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index a53f77a7021..e3539620351 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -351,15 +351,15 @@ if (! is_array($x_coll) || ! is_array($x_paye)) print ''.$langs->trans("DateInvoice").''; if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print ''.$langs->trans("DatePayment").''; else print ''; - print ''.$namerate.''; + print ''.$namerate.''; print ''.$productcust.''; if ($modetax != 1) { - print ''.$amountcust.''; - print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'; + print ''.$amountcust.''; + print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'; } - print ''.$langs->trans("AmountHTVATRealReceived").''; - print ''.$vatcust.''; + print ''.$langs->trans("AmountHTVATRealReceived").''; + print ''.$vatcust.''; print ''; $action = "tvadetail"; @@ -414,7 +414,7 @@ if (! is_array($x_coll) || ! is_array($x_paye)) print ''; // Ref - print ''.$fields['link'].''; + print ''.$fields['link'].''; // Invoice date print '' . dol_print_date($fields['datef'], 'day') . ''; @@ -424,7 +424,7 @@ if (! is_array($x_coll) || ! is_array($x_paye)) else print ''; // Rate - print '' . $fields['drate'] . ''; + print '' . $fields['drate'] . ''; // Description print ''; @@ -464,7 +464,7 @@ if (! is_array($x_coll) || ! is_array($x_paye)) // Total HT if ($modetax != 1) { - print ''; + print ''; print price($fields['totalht']); if (price2num($fields['ftotal_ttc'])) { @@ -479,7 +479,7 @@ if (! is_array($x_coll) || ! is_array($x_paye)) $ratiopaymentinvoice=1; if ($modetax != 1) { - print ''; + print ''; //print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc']; if ($fields['payment_amount'] && $fields['ftotal_ttc']) { @@ -503,13 +503,13 @@ if (! is_array($x_coll) || ! is_array($x_paye)) } // Total collected - print ''; + print ''; $temp_ht=$fields['totalht']*$ratiopaymentinvoice; print price(price2num($temp_ht, 'MT'), 1); print ''; // VAT - print ''; + print ''; $temp_vat=$fields['vat']*$ratiopaymentinvoice; print price(price2num($temp_vat, 'MT'), 1); //print price($fields['vat']); @@ -524,13 +524,13 @@ if (! is_array($x_coll) || ! is_array($x_paye)) // Total customers for this vat rate print ''; print ''; - print ''.$langs->trans("Total").':'; + print ''.$langs->trans("Total").':'; if ($modetax != 1) { - print ' '; - print ' '; + print ' '; + print ' '; } - print ''.price(price2num($subtot_coll_total_ht, 'MT')).''; - print ''.price(price2num($subtot_coll_vat, 'MT')).''; + print ''.price(price2num($subtot_coll_total_ht, 'MT')).''; + print ''.price(price2num($subtot_coll_vat, 'MT')).''; print ''; } @@ -538,13 +538,13 @@ if (! is_array($x_coll) || ! is_array($x_paye)) { print ''; print ''; - print ''.$langs->trans("Total").':'; + print ''.$langs->trans("Total").':'; if ($modetax != 1) { - print ' '; - print ' '; + print ' '; + print ' '; } - print ''.price(price2num(0, 'MT')).''; - print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; print ''; } @@ -560,11 +560,11 @@ if (! is_array($x_coll) || ! is_array($x_paye)) print ''.$namesup.''; print ''.$productsup.''; if ($modetax != 1) { - print ''.$amountsup.''; - print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'; + print ''.$amountsup.''; + print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')'; } - print ''.$langs->trans("AmountHTVATRealPaid").''; - print ''.$vatsup.''; + print ''.$langs->trans("AmountHTVATRealPaid").''; + print ''.$vatsup.''; print ''."\n"; foreach (array_keys($x_paye) as $thirdparty_id) @@ -607,7 +607,7 @@ if (! is_array($x_coll) || ! is_array($x_paye)) print ''; // Ref - print ''.$fields['link'].''; + print ''.$fields['link'].''; // Invoice date print '' . dol_print_date($fields['datef'], 'day') . ''; @@ -657,7 +657,7 @@ if (! is_array($x_coll) || ! is_array($x_paye)) // Total HT if ($modetax != 1) { - print ''; + print ''; print price($fields['totalht']); if (price2num($fields['ftotal_ttc'])) { @@ -672,7 +672,7 @@ if (! is_array($x_coll) || ! is_array($x_paye)) $ratiopaymentinvoice=1; if ($modetax != 1) { - print ''; + print ''; if ($fields['payment_amount'] && $fields['ftotal_ttc']) { $paymentfourn_static->id=$fields['payment_id']; @@ -698,13 +698,13 @@ if (! is_array($x_coll) || ! is_array($x_paye)) } // VAT paid - print ''; + print ''; $temp_ht=$fields['totalht']*$ratiopaymentinvoice; print price(price2num($temp_ht, 'MT'), 1); print ''; // VAT - print ''; + print ''; $temp_vat=$fields['vat']*$ratiopaymentinvoice; print price(price2num($temp_vat, 'MT'), 1); //print price($fields['vat']); @@ -719,26 +719,26 @@ if (! is_array($x_coll) || ! is_array($x_paye)) // Total suppliers for this vat rate print ''; print ''; - print ''.$langs->trans("Total").':'; + print ''.$langs->trans("Total").':'; if ($modetax != 1) { - print ' '; - print ' '; + print ' '; + print ' '; } - print ''.price(price2num($subtot_paye_total_ht, 'MT')).''; - print ''.price(price2num($subtot_paye_vat, 'MT')).''; + print ''.price(price2num($subtot_paye_total_ht, 'MT')).''; + print ''.price(price2num($subtot_paye_vat, 'MT')).''; print ''; } if (count($x_paye) == 0) { // Show a total line if nothing shown print ''; print ''; - print ''.$langs->trans("Total").':'; + print ''.$langs->trans("Total").':'; if ($modetax != 1) { - print ' '; - print ' '; + print ' '; + print ' '; } - print ''.price(price2num(0, 'MT')).''; - print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; + print ''.price(price2num(0, 'MT')).''; print ''; } @@ -750,7 +750,7 @@ if (! is_array($x_coll) || ! is_array($x_paye)) $diff = $x_coll_sum - $x_paye_sum; print ''; print ''.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').''; - print ''.price(price2num($diff, 'MT'))."\n"; + print ''.price(price2num($diff, 'MT'))."\n"; print "\n"; $i++;