|
|
@@ -306,7 +306,7 @@ function generateMonthlyVATSummary($conn, $dateConditions) {
|
|
|
$start = new DateTime($dateConditions['start_date']);
|
|
|
$end = new DateTime($dateConditions['end_date']);
|
|
|
$interval = new DateInterval('P1M');
|
|
|
- $period = new DatePeriod($start, $interval, $end->modify('+1 month'));
|
|
|
+ $period = new DatePeriod($start, $interval, $end->modify('last day of this month'));
|
|
|
|
|
|
foreach ($period as $month) {
|
|
|
$monthStart = $month->format('Y-m-01');
|
|
|
@@ -332,9 +332,28 @@ function generateMonthlyVATSummary($conn, $dateConditions) {
|
|
|
$vatBreakdown = calculateVATBreakdown($entries);
|
|
|
$totals = calculateVATTotals($vatBreakdown);
|
|
|
|
|
|
+ // Finnish month names
|
|
|
+ $finnishMonths = [
|
|
|
+ 'January' => 'Tammikuu',
|
|
|
+ 'February' => 'Helmikuu',
|
|
|
+ 'March' => 'Maaliskuu',
|
|
|
+ 'April' => 'Huhtikuu',
|
|
|
+ 'May' => 'Toukokuu',
|
|
|
+ 'June' => 'Kesäkuu',
|
|
|
+ 'July' => 'Heinäkuu',
|
|
|
+ 'August' => 'Elokuu',
|
|
|
+ 'September' => 'Syyskuu',
|
|
|
+ 'October' => 'Lokakuu',
|
|
|
+ 'November' => 'Marraskuu',
|
|
|
+ 'December' => 'Joulukuu'
|
|
|
+ ];
|
|
|
+
|
|
|
+ $englishMonthName = $month->format('F');
|
|
|
+ $finnishMonthName = $finnishMonths[$englishMonthName] ?? $englishMonthName;
|
|
|
+
|
|
|
$monthlySummary[] = [
|
|
|
'month' => $month->format('Y-m'),
|
|
|
- 'month_name' => $month->format('F Y'),
|
|
|
+ 'month_name' => $finnishMonthName . ' ' . $month->format('Y'),
|
|
|
'payable' => $totals['payable_vat'] ?? 0,
|
|
|
'deductible' => $totals['deductible_vat'] ?? 0,
|
|
|
'net' => $totals['net_vat'] ?? 0,
|