FDS2610/Steuerkram
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'Feature: Lieferantenname im Buchungsjournal' (#74) from fds2610-bot/Steuerkram:main into main

Browse source 
Reviewed-on: https://codeberg.org/fds2610/Steuerkram/pulls/74
This commit is contained in:
fds2610 2026-05-15 20:48:20 +02:00
commit c38156b1ca
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Models/Booking.php
View file

@ -44,7 +44,8 @@ class Booking
$params[] = (int)$filter['konto'];
}
if (!empty($filter['search'])) {
$where[] = 'bk.buchungstext LIKE ?';
$where[] = '(bk.buchungstext LIKE ? OR s.name LIKE ?)';
$params[] = '%' . $filter['search'] . '%';
$params[] = '%' . $filter['search'] . '%';
}
@ -53,13 +54,15 @@ class Booking
k.kontonummer as kategorie_nr, k.bezeichnung as kategorie_name,
z.kontonummer as zahlungs_nr, z.bezeichnung as zahlungs_name,
bl.beleg_nr, fy.year as fiscal_year_nr,
a.anlage_nr, a.bezeichnung as anlage_bezeichnung
a.anlage_nr, a.bezeichnung as anlage_bezeichnung,
s.name as supplier_name
FROM bookings bk
JOIN accounts k ON bk.kategorie_konto_id = k.id
JOIN accounts z ON bk.zahlungskonto_id = z.id
JOIN belege bl ON bk.beleg_id = bl.id
JOIN fiscal_years fy ON bk.fiscal_year_id = fy.id
LEFT JOIN assets a ON bk.asset_id = a.id
LEFT JOIN suppliers s ON bl.supplier_id = s.id
WHERE ' . implode(' AND ', $where) . '
ORDER BY bk.buchungs_datum DESC, bk.id DESC
LIMIT ? OFFSET ?';
@ -71,6 +74,8 @@ class Booking
$countSql = 'SELECT COUNT(*) as cnt FROM bookings bk
JOIN fiscal_years fy ON bk.fiscal_year_id = fy.id
JOIN belege bl ON bk.beleg_id = bl.id
LEFT JOIN suppliers s ON bl.supplier_id = s.id
WHERE ' . implode(' AND ', $where);
$countParams = array_slice($params, 0, -2);
$total = (int)(Database::fetchOne($countSql, $countParams)['cnt'] ?? 0);

9
src/Views/bookings/journal.php
View file

@ -3,7 +3,7 @@
<div class="toolbar">
<div class="toolbar-left">
<form method="get" style="display:flex;gap:.5rem;flex-wrap:wrap;align-items:center">
<input type="search" name="search" placeholder="Buchungstext suchen…"
<input type="search" name="search" placeholder="Buchungstext / Lieferant…"
value="<?= $h($filter['search'] ?? '') ?>" style="width:220px">
<select name="year" style="width:80px">
<option value="">Alle Jahre</option>
@ -64,7 +64,12 @@
<?= $h($bk['buchungs_nr']) ?>
</td>
<td class="td-muted"><?= View::formatDate($bk['buchungs_datum']) ?></td>
<td><a href="/belege/<?= $h($bk['beleg_id']) ?>" class="td-mono text-sm"><?= $h($bk['beleg_nr']) ?></a></td>
<td>
<a href="/belege/<?= $h($bk['beleg_id']) ?>" class="td-mono text-sm"><?= $h($bk['beleg_nr']) ?></a>
<?php if (!empty($bk['supplier_name'])): ?>
<br><span class="td-muted"><?= $h(mb_strimwidth($bk['supplier_name'], 0, 25, '…')) ?></span>
<?php endif; ?>
</td>
<td><span class="badge <?= $bk['buchungstyp'] === 'Einnahme' ? 'badge-green' : 'badge-red' ?>"><?= $h($bk['buchungstyp']) ?></span></td>
<td class="td-mono text-sm">
<?= $h($bk['kategorie_nr']) ?><br>