AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy up the tax report

This commit is contained in:
wrongecho 2024-10-03 20:41:12 +01:00
parent 6d6689e7c5
commit e433c819a8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
report_tax_summary.php
View File

@ -71,23 +71,24 @@ $sql_tax = mysqli_query($mysqli, "SELECT `tax_name` FROM `taxes`");
<tbody>
<?php
while ($row = mysqli_fetch_array($sql_tax)) {
$tax_name = sanitizeInput($row['tax_name']);
echo "<tr>";
echo "<td>" . $row['tax_name'] . "</td>";
if ($view == 'monthly') {
for ($i = 1; $i <= 12; $i++) {
$monthly_tax = getMonthlyTax($row['tax_name'], $i, $year, $mysqli);
$monthly_tax = getMonthlyTax($tax_name, $i, $year, $mysqli);
echo "<td class='text-right'>" . numfmt_format_currency($currency_format, $monthly_tax, $company_currency) . "</td>";
}
} else {
for ($q = 1; $q <= 4; $q++) {
$quarterly_tax = getQuarterlyTax($row['tax_name'], $q, $year, $mysqli);
$quarterly_tax = getQuarterlyTax($tax_name, $q, $year, $mysqli);
echo "<td class='text-right'>" . numfmt_format_currency($currency_format, $quarterly_tax, $company_currency) . "</td>";
}
}
// Calculate total for row and echo bold
$total_tax = getTotalTax($row['tax_name'], $year, $mysqli);
$total_tax = getTotalTax($tax_name, $year, $mysqli);
echo "<td class='text-right text-bold'>" . numfmt_format_currency($currency_format, $total_tax, $company_currency) . "</td>";
echo "</tr>";
}
@ -97,12 +98,12 @@ $sql_tax = mysqli_query($mysqli, "SELECT `tax_name` FROM `taxes`");
<?php
if ($view == 'monthly') {
for ($i = 1; $i <= 12; $i++) {
$monthly_tax = getMonthlyTax($row['tax_name'], $i, $year, $mysqli);
$monthly_tax = getMonthlyTax($tax_name, $i, $year, $mysqli);
echo "<th class='text-right'>" . numfmt_format_currency($currency_format, $monthly_tax, $company_currency) . "</th>";
}
} else {
for ($q = 1; $q <= 4; $q++) {
$quarterly_tax = getQuarterlyTax($row['tax_name'], $q, $year, $mysqli);
$quarterly_tax = getQuarterlyTax($tax_name, $q, $year, $mysqli);
echo "<th class='text-right'>" . numfmt_format_currency($currency_format, $quarterly_tax, $company_currency) . "</th>";
}
}