Fix: Buchungs-Redirect, Steuerart-Label, Bankbuchungs-Listenansicht
- Nach Buchung aus Bank-Kontext bleibt Ansicht auf dem Beleg (kein Redirect zu /bank) - Steuerart-Option 'Normal' umbenannt in 'Normal (Inland/Drittland)' - Offene-Belege-Tabelle: erste drei Spalten gestapelt, kein doppeltes €-Zeichen
This commit is contained in:
parent
af83ae8592
commit
6bff984ca0
3 changed files with 16 additions and 17 deletions
|
|
@ -209,10 +209,9 @@ class BookingController extends BaseController
|
|||
|
||||
if ($newAssetId !== null) {
|
||||
View::redirect("/assets/{$newAssetId}/edit", 'Buchung erfasst. Bitte Wirtschaftsgut-Details ergänzen.');
|
||||
} elseif ($bankTxId > 0) {
|
||||
View::redirect('/bank', 'Buchung erfasst und Bankbuchung verknüpft.');
|
||||
} else {
|
||||
View::redirect("/belege/{$belegId}", 'Buchung erfasst.');
|
||||
$msg = $bankTxId > 0 ? 'Buchung erfasst und Bankbuchung verknüpft.' : 'Buchung erfasst.';
|
||||
View::redirect("/belege/{$belegId}", $msg);
|
||||
}
|
||||
} catch (\PDOException $e) {
|
||||
error_log('[Steuerkram] PDO-Fehler in BookingController::store(): ' . $e->getMessage());
|
||||
|
|
|
|||
|
|
@ -224,9 +224,7 @@ $restFormatted = number_format($remaining, 2, ',', '.');
|
|||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Belegnr.</th>
|
||||
<th>Datum</th>
|
||||
<th>Typ</th>
|
||||
<th>Beleg</th>
|
||||
<th>Lieferant</th>
|
||||
<th class="td-right">Brutto</th>
|
||||
<th></th>
|
||||
|
|
@ -239,20 +237,22 @@ $restFormatted = number_format($remaining, 2, ',', '.');
|
|||
data-beleg-id="<?= (int)$b['id'] ?>"
|
||||
style="cursor:<?= $hatBeleg ? 'pointer' : 'default' ?>"
|
||||
<?= $hatBeleg ? 'title="Klicken zum Vorschau anzeigen"' : '' ?>>
|
||||
<td class="td-mono" onclick="event.stopPropagation()">
|
||||
<td onclick="event.stopPropagation()" style="white-space:nowrap">
|
||||
<div class="td-mono" style="font-size:.8rem">
|
||||
<?php if ($hatBeleg): ?>
|
||||
<a href="/belege/<?= (int)$b['id'] ?>" target="_blank"><?= $h($b['beleg_nr']) ?></a>
|
||||
<?php else: ?>
|
||||
<a href="/invoices/<?= (int)$b['invoice_id'] ?>" target="_blank"><?= $h($b['beleg_nr']) ?></a>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<div class="td-mono text-muted" style="font-size:.78rem"><?= $h(View::formatDate($b['beleg_datum'])) ?></div>
|
||||
<div style="margin-top:.15rem"><span class="badge badge-gray" style="font-size:.7rem"><?= $h($b['belegtyp']) ?></span></div>
|
||||
</td>
|
||||
<td class="td-mono"><?= $h(View::formatDate($b['beleg_datum'])) ?></td>
|
||||
<td><span class="badge badge-gray"><?= $h($b['belegtyp']) ?></span></td>
|
||||
<td>
|
||||
<?= $b['supplier_name'] ? $h($b['supplier_name']) : '<span class="text-muted">–</span>' ?>
|
||||
</td>
|
||||
<td class="td-right td-mono">
|
||||
<?= $b['betrag_brutto'] ? $fmt($b['betrag_brutto']) . ' €' : '<span class="text-muted">–</span>' ?>
|
||||
<td class="td-right td-mono" style="white-space:nowrap">
|
||||
<?= $b['betrag_brutto'] ? $fmt($b['betrag_brutto']) : '<span class="text-muted">–</span>' ?>
|
||||
</td>
|
||||
<td onclick="event.stopPropagation()">
|
||||
<?php if ($hatBeleg): ?>
|
||||
|
|
|
|||
|
|
@ -484,7 +484,7 @@ $suppliers = $suppliers ?? [];
|
|||
<select name="steuerart" id="steuerart_select">
|
||||
<?php
|
||||
$steuerartOptionen = [
|
||||
'normal' => 'Normal (Inland)',
|
||||
'normal' => 'Normal (Inland/Drittland)',
|
||||
'ig_lieferung' => 'Steuerfreie ig. Lieferung § 4 Nr. 1b (Kz 41)',
|
||||
'export' => 'Steuerfreie Ausfuhr § 4 Nr. 1a (Kz 44)',
|
||||
'ig_erwerb_19' => 'Innergemeinschaftlicher Erwerb 19 % – ReverseCharge (Kz 89/91/67)',
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue