lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update with html5 compliant code

Browse Source
This commit is contained in:
Philippe GRAND 2019-02-14 16:43:40 +01:00
parent 1f2dd3bc29
commit ed1a59d00b
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
htdocs/compta/tva/quadri_detail.php
View File

@ -344,11 +344,11 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '<td class="left">'.$productcust.'</td>'; print '<td class="left">'.$productcust.'</td>';
if ($modetax != 1) if ($modetax != 1)
{ {
print '<td align="right">'.$amountcust.'</td>'; print '<td class="right">'.$amountcust.'</td>';
print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>'; print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
} }
print '<td align="right">'.$langs->trans("AmountHTVATRealReceived").'</td>'; print '<td class="right">'.$langs->trans("AmountHTVATRealReceived").'</td>';
print '<td align="right">'.$vatcust.'</td>'; print '<td class="right">'.$vatcust.'</td>';
print '</tr>'; print '</tr>';
$action = "tvadetail"; $action = "tvadetail";
@ -390,7 +390,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '<tr class="oddeven">'; print '<tr class="oddeven">';
// Ref // Ref
print '<td class="nowrap" align="left">'.$fields['link'].'</td>'; print '<td class="nowrap left">'.$fields['link'].'</td>';
// Invoice date // Invoice date
print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>'; print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
@ -440,7 +440,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Total HT // Total HT
if ($modetax != 1) if ($modetax != 1)
{ {
print '<td class="nowrap" align="right">'; print '<td class="nowrap right">';
print price($fields['totalht']); print price($fields['totalht']);
if (price2num($fields['ftotal_ttc'])) if (price2num($fields['ftotal_ttc']))
{ {
@ -455,7 +455,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
$ratiopaymentinvoice=1; $ratiopaymentinvoice=1;
if ($modetax != 1) if ($modetax != 1)
{ {
print '<td class="nowrap" align="right">'; print '<td class="nowrap right">';
//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc']; //print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
if ($fields['payment_amount'] && $fields['ftotal_ttc']) if ($fields['payment_amount'] && $fields['ftotal_ttc'])
{ {
@ -479,13 +479,13 @@ if (! is_array($x_coll) || ! is_array($x_paye))
} }
// Total collected // Total collected
print '<td class="nowrap" align="right">'; print '<td class="nowrap right">';
$temp_ht=$fields['totalht']*$ratiopaymentinvoice; $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
print price(price2num($temp_ht, 'MT'), 1); print price(price2num($temp_ht, 'MT'), 1);
print '</td>'; print '</td>';
// VAT // VAT
print '<td class="nowrap" align="right">'; print '<td class="nowrap right">';
$temp_vat=$fields['vat']*$ratiopaymentinvoice; $temp_vat=$fields['vat']*$ratiopaymentinvoice;
print price(price2num($temp_vat, 'MT'), 1); print price(price2num($temp_vat, 'MT'), 1);
//print price($fields['vat']); //print price($fields['vat']);
@ -500,13 +500,13 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Total customers for this vat rate // Total customers for this vat rate
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td colspan="4"></td>'; print '<td colspan="4"></td>';
print '<td align="right">'.$langs->trans("Total").':</td>'; print '<td class="right">'.$langs->trans("Total").':</td>';
if ($modetax != 1) { if ($modetax != 1) {
print '<td class="nowrap" align="right">&nbsp;</td>'; print '<td class="nowrap right">&nbsp;</td>';
print '<td align="right">&nbsp;</td>'; print '<td class="right">&nbsp;</td>';
} }
print '<td align="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>'; print '<td class="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
print '<td class="nowrap" align="right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>'; print '<td class="nowrap right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
print '</tr>'; print '</tr>';
} }
@ -514,13 +514,13 @@ if (! is_array($x_coll) || ! is_array($x_paye))
{ {
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td colspan="4"></td>'; print '<td colspan="4"></td>';
print '<td align="right">'.$langs->trans("Total").':</td>'; print '<td class="right">'.$langs->trans("Total").':</td>';
if ($modetax != 1) { if ($modetax != 1) {
print '<td class="nowrap" align="right">&nbsp;</td>'; print '<td class="nowrap right">&nbsp;</td>';
print '<td align="right">&nbsp;</td>'; print '<td class="right">&nbsp;</td>';
} }
print '<td align="right">'.price(price2num(0, 'MT')).'</td>'; print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
print '<td class="nowrap" align="right">'.price(price2num(0, 'MT')).'</td>'; print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
print '</tr>'; print '</tr>';
} }
@ -536,11 +536,11 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '<td class="left">'.$namesup.'</td>'; print '<td class="left">'.$namesup.'</td>';
print '<td class="left">'.$productsup.'</td>'; print '<td class="left">'.$productsup.'</td>';
if ($modetax != 1) { if ($modetax != 1) {
print '<td align="right">'.$amountsup.'</td>'; print '<td class="right">'.$amountsup.'</td>';
print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>'; print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
} }
print '<td align="right">'.$langs->trans("AmountHTVATRealPaid").'</td>'; print '<td class="right">'.$langs->trans("AmountHTVATRealPaid").'</td>';
print '<td align="right">'.$vatsup.'</td>'; print '<td class="right">'.$vatsup.'</td>';
print '</tr>'."\n"; print '</tr>'."\n";
foreach (array_keys($x_paye) as $rate) foreach (array_keys($x_paye) as $rate)
@ -571,7 +571,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '<tr class="oddeven">'; print '<tr class="oddeven">';
// Ref // Ref
print '<td class="nowrap" align="left">'.$fields['link'].'</td>'; print '<td class="nowrap left">'.$fields['link'].'</td>';
// Invoice date // Invoice date
print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>'; print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
@ -621,7 +621,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Total HT // Total HT
if ($modetax != 1) if ($modetax != 1)
{ {
print '<td class="nowrap" align="right">'; print '<td class="nowrap right">';
print price($fields['totalht']); print price($fields['totalht']);
if (price2num($fields['ftotal_ttc'])) if (price2num($fields['ftotal_ttc']))
{ {
@ -636,7 +636,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
$ratiopaymentinvoice=1; $ratiopaymentinvoice=1;
if ($modetax != 1) if ($modetax != 1)
{ {
print '<td class="nowrap" align="right">'; print '<td class="nowrap right">';
if ($fields['payment_amount'] && $fields['ftotal_ttc']) if ($fields['payment_amount'] && $fields['ftotal_ttc'])
{ {
$paymentfourn_static->id=$fields['payment_id']; $paymentfourn_static->id=$fields['payment_id'];
@ -662,13 +662,13 @@ if (! is_array($x_coll) || ! is_array($x_paye))
} }
// VAT paid // VAT paid
print '<td class="nowrap" align="right">'; print '<td class="nowrap right">';
$temp_ht=$fields['totalht']*$ratiopaymentinvoice; $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
print price(price2num($temp_ht, 'MT'), 1); print price(price2num($temp_ht, 'MT'), 1);
print '</td>'; print '</td>';
// VAT // VAT
print '<td class="nowrap" align="right">'; print '<td class="nowrap right">';
$temp_vat=$fields['vat']*$ratiopaymentinvoice; $temp_vat=$fields['vat']*$ratiopaymentinvoice;
print price(price2num($temp_vat, 'MT'), 1); print price(price2num($temp_vat, 'MT'), 1);
//print price($fields['vat']); //print price($fields['vat']);
@ -683,26 +683,26 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Total suppliers for this vat rate // Total suppliers for this vat rate
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td colspan="4"></td>'; print '<td colspan="4"></td>';
print '<td align="right">'.$langs->trans("Total").':</td>'; print '<td class="right">'.$langs->trans("Total").':</td>';
if ($modetax != 1) { if ($modetax != 1) {
print '<td class="nowrap" align="right">&nbsp;</td>'; print '<td class="nowrap right">&nbsp;</td>';
print '<td align="right">&nbsp;</td>'; print '<td class="right">&nbsp;</td>';
} }
print '<td align="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>'; print '<td class="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
print '<td class="nowrap" align="right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>'; print '<td class="nowrap right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
print '</tr>'; print '</tr>';
} }
if (count($x_paye) == 0) { // Show a total line if nothing shown if (count($x_paye) == 0) { // Show a total line if nothing shown
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td colspan="4"></td>'; print '<td colspan="4"></td>';
print '<td align="right">'.$langs->trans("Total").':</td>'; print '<td class="right">'.$langs->trans("Total").':</td>';
if ($modetax != 1) { if ($modetax != 1) {
print '<td class="nowrap" align="right">&nbsp;</td>'; print '<td class="nowrap right">&nbsp;</td>';
print '<td align="right">&nbsp;</td>'; print '<td class="right">&nbsp;</td>';
} }
print '<td align="right">'.price(price2num(0, 'MT')).'</td>'; print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
print '<td class="nowrap" align="right">'.price(price2num(0, 'MT')).'</td>'; print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
print '</tr>'; print '</tr>';
} }
@ -714,7 +714,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
$diff = $x_coll_sum - $x_paye_sum; $diff = $x_coll_sum - $x_paye_sum;
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>'; print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n"; print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
print "</tr>\n"; print "</tr>\n";
$i++; $i++;