- Rechnungsnr.
+ {{ t('meta_invoice_no', lang) }}
{{ invoice.number }}
- Rechnungsdatum
+ {{ t('meta_issue_date', lang) }}
{{ invoice.issueDate | date_unix }}
{% if invoice.servicePeriodStart and invoice.servicePeriodEnd %}
- Leistungszeitraum
+ {{ t('meta_service_period', lang) }}
{{ invoice.servicePeriodStart | date_unix }} – {{ invoice.servicePeriodEnd | date_unix }}
{% elif invoice.deliveryDate %}
- Leistungsdatum
+ {{ t('meta_delivery_date', lang) }}
{{ invoice.deliveryDate | date_unix }}
{% endif %}
{% if not invoice.isCreditNote %}
- Fällig am
+ {{ t('meta_due_date', lang) }}
{{ invoice.dueDate | date_unix }}
{% endif %}
{% if customer.vatId %}
- USt-IdNr. Kunde
+ {{ t('meta_customer_vatid', lang) }}
{{ customer.vatId }}
{% endif %}
@@ -76,13 +77,13 @@
| Pos. | -Beschreibung | -Menge | -Einheit | -Einzelpreis | - {% if not invoice.isKleinunternehmer and not invoice.isReverseCharge %}USt % | {% endif %} -Gesamt | +{{ t('col_pos', lang) }} | +{{ t('col_desc', lang) }} | +{{ t('col_qty', lang) }} | +{{ t('col_unit', lang) }} | +{{ t('col_price', lang) }} | + {% if not invoice.isKleinunternehmer and not invoice.isReverseCharge %}{{ t('col_vat', lang) }} | {% endif %} +{{ t('col_total', lang) }} |
|---|
| Zwischensumme | +{{ t('totals_subtotal', lang) }} | {{ invoice.subtotal | eur(invoice.currency) }} | |||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Umsatzsteuer | +{{ t('totals_vat', lang) }} | {{ invoice.vatAmount | eur(invoice.currency) }} | |||||||||||
| Gesamtbetrag | +{{ t('totals_grand', lang) }} | {{ invoice.total | eur(invoice.currency) }} | |||||||||||
| Bereits gezahlt | +{{ t('totals_already_paid', lang) }} | − {{ invoice.amountPaidCent | eur(invoice.currency) }} | |||||||||||
| Noch offen | +{{ t('totals_remaining', lang) }} | {{ (invoice.total - invoice.amountPaidCent) | eur(invoice.currency) }} |
| Pos. | -Beschreibung | -Menge | -Einheit | -Einzelpreis | - {% if not offer.isKleinunternehmer and not offer.isReverseCharge %}USt % | {% endif %} -Gesamt | +{{ t('col_pos', lang) }} | +{{ t('col_desc', lang) }} | +{{ t('col_qty', lang) }} | +{{ t('col_unit', lang) }} | +{{ t('col_price', lang) }} | + {% if not offer.isKleinunternehmer and not offer.isReverseCharge %}{{ t('col_vat', lang) }} | {% endif %} +{{ t('col_total', lang) }} |
|---|
| Zwischensumme | +{{ t('totals_subtotal', lang) }} | {{ offer.subtotal | eur(offer.currency) }} |
|---|---|---|
| Umsatzsteuer | +{{ t('totals_vat', lang) }} | {{ offer.vatAmount | eur(offer.currency) }} |
| Gesamtbetrag | +{{ t('totals_grand', lang) }} | {{ offer.total | eur(offer.currency) }} |
- Bei Auftragsannahme wird die Rechnung mit dem Hinweis "Steuerschuldnerschaft des Leistungsempfängers" ausgestellt (Reverse Charge). -
+{{ t('offer_rc_hint', lang) }}
{% endif %}- Dieses Angebot ist freibleibend und unverbindlich. Gültig bis {{ offer.validUntil | date_unix }}. - Bei Annahme erstellen wir eine entsprechende Rechnung. + {{ t('offer_disclaimer', lang, date=offer.validUntil | date_unix) }}
{% if offer.skontoPercent and offer.skontoDays and offer.skontoAmountCent %}Skonto-Angebot
+ {{ t('block_skonto_offer', lang) }}
- Bei Zahlung der späteren Rechnung innerhalb von {{ offer.skontoDays }} Tagen - ab Rechnungsdatum gewähren wir - {{ "%.1f"|format(offer.skontoPercent) }} % Skonto. + {{ t('skonto_offer_text', lang, days=offer.skontoDays, percent='%.1f'|format(offer.skontoPercent)) }}
Hinweise
+ {{ t('block_notes', lang) }}
{{ offer.notes | replace('\n', '
') | safe }}
') | safe }}
{{ company.postalCode }} {{ company.city }}
-
Kontakt
+ {{ t('footer_contact', lang) }}
{% if company.email %}{{ company.email }}
{% endif %}
{% if company.phone %}{{ company.phone }}
{% endif %}
{% if company.website %}{{ company.website }}
{% endif %}
-
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index aed6476..6d570fe 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -6876,7 +6876,7 @@ dependencies = [
[[package]]
name = "zettel"
-version = "0.15.0"
+version = "0.16.0"
dependencies = [
"aes-gcm",
"argon2",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 66401c6..41d5f7c 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "zettel"
-version = "0.15.0"
+version = "0.16.0"
description = "Zettel — Offline-first invoice generator"
authors = ["Jonas Laux"]
edition = "2021"
diff --git a/src-tauri/src/backup.rs b/src-tauri/src/backup.rs
index 43eaf18..a9c5cb0 100644
--- a/src-tauri/src/backup.rs
+++ b/src-tauri/src/backup.rs
@@ -251,7 +251,7 @@ pub async fn stage_restore(
// Muss mit dem Wert in `Settings.svelte`:CURRENT_DB_SCHEMA_VERSION
// sowie dem höchsten registrierten Migrations-`version` in `lib.rs`
// synchron bleiben. Bei neuer Migration: hier hochzählen.
- const CURRENT_SCHEMA: u32 = 24;
+ const CURRENT_SCHEMA: u32 = 26;
if parsed.db_schema_version > CURRENT_SCHEMA {
return Err(format!(
"Backup-Schema {} ist neuer als die App-Version (Schema {}). Bitte App aktualisieren.",
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index caf5055..b053937 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -155,6 +155,18 @@ fn build_migrations() -> VecSteuer
- {% if company.taxNumber %}St-Nr. {{ company.taxNumber }}
{% endif %}
- {% if company.vatId %}USt-IdNr. {{ company.vatId }}
{% endif %}
+ {{ t('footer_tax', lang) }}
+ {% if company.taxNumber %}{{ t('footer_tax_no', lang) }} {{ company.taxNumber }}
{% endif %}
+ {% if company.vatId %}{{ t('footer_vat_id', lang) }} {{ company.vatId }}
{% endif %}
{item.descriptionDe}
+ {#if descriptionFor(item)}
+ {descriptionFor(item)}
{/if}
diff --git a/src/lib/utils/auto-backup.ts b/src/lib/utils/auto-backup.ts
index 60fb950..e333de2 100644
--- a/src/lib/utils/auto-backup.ts
+++ b/src/lib/utils/auto-backup.ts
@@ -19,7 +19,7 @@ function weekdaySlug(date: Date): string {
return WEEKDAY_SLUGS[date.getDay()];
}
-const CURRENT_DB_SCHEMA_VERSION = 24;
+const CURRENT_DB_SCHEMA_VERSION = 26;
export async function maybeRunAutoBackup(): Promise<{ ran: boolean; reason: string }> {
let settings;
diff --git a/src/routes/ExpenseEdit.svelte b/src/routes/ExpenseEdit.svelte
index 469e0ac..8bdc2fd 100644
--- a/src/routes/ExpenseEdit.svelte
+++ b/src/routes/ExpenseEdit.svelte
@@ -15,7 +15,8 @@
type ExpenseFormInput,
type ExpenseItemInput,
} from "$lib/db/expenses";
- import type { Expense, ExpenseStatus, Vendor } from "$lib/db/schema";
+ import type { Expense, ExpenseStatus, Vendor, ExpenseCategory } from "$lib/db/schema";
+ import { listCategories as listCuratedCategories, accountForSkr } from "$lib/db/expense-categories";
import { centsToEur, eurStringToCents } from "$lib/utils/money";
import { fromIsoDate, nowUnix, toIsoDate } from "$lib/utils/date";
import {
@@ -67,6 +68,7 @@
let vendors = $state([]);
let categories = $state([]);
+ let curatedCategories = $state([]);
let id = $state(null);
let existing = $state(null);
let loaded = $state(false);
@@ -85,6 +87,7 @@
{
description: "",
category: null,
+ categoryId: null,
datevAccount: null,
quantity: 1,
unit: "Stk",
@@ -106,14 +109,41 @@
let validationFindingsCount = $state(null);
$effect(() => {
- Promise.all([listVendors(), listCategories()])
- .then(([vs, cs]) => {
+ Promise.all([listVendors(), listCategories(), listCuratedCategories()])
+ .then(([vs, cs, curated]) => {
vendors = vs;
categories = cs;
+ curatedCategories = curated;
})
.catch((e) => (error = String(e)));
});
+ const curatedCategoryItems = $derived([
+ { value: "", label: "— frei eintragen —" },
+ ...curatedCategories.map((c) => ({ value: String(c.id), label: c.name })),
+ ]);
+
+ function pickCuratedCategory(idx: number, valueStr: string) {
+ const it = items[idx];
+ if (valueStr === "") {
+ it.categoryId = null;
+ // Freitext-Feld bleibt unangetastet — User kann manuell tippen.
+ } else {
+ const cId = Number.parseInt(valueStr, 10);
+ const cat = curatedCategories.find((c) => c.id === cId);
+ if (cat) {
+ it.categoryId = cat.id;
+ it.category = cat.name;
+ // DATEV-Konto vorbefüllen wenn leer (SKR03-Default — DATEV-Export
+ // löst pro Beleg über categoryId neu auf, das hier ist nur UI-Hint).
+ if (!it.datevAccount) {
+ it.datevAccount = accountForSkr(cat, "SKR03");
+ }
+ }
+ }
+ items = [...items];
+ }
+
// Prefill default category from selected vendor when creating a new expense.
const selectedVendor = $derived(
vendorIdStr ? vendors.find((v) => String(v.id) === vendorIdStr) ?? null : null,
@@ -153,6 +183,7 @@
items = res.items.map((it) => ({
description: it.description,
category: it.category,
+ categoryId: it.categoryId ?? null,
datevAccount: it.datevAccount,
quantity: it.quantity,
unit: it.unit,
@@ -172,6 +203,7 @@
{
description: "",
category: selectedVendor?.defaultCategory ?? null,
+ categoryId: null,
datevAccount: null,
quantity: 1,
unit: "Stk",
@@ -189,6 +221,7 @@
{
description: it.name + (it.descriptionDe ? ` — ${it.descriptionDe}` : ""),
category: selectedVendor?.defaultCategory ?? null,
+ categoryId: null,
datevAccount: it.defaultDatevAccount ?? null,
quantity: 1,
unit: it.unit,
@@ -289,6 +322,7 @@
items = data.lineItems.map((li) => ({
description: li.description,
category: matched?.defaultCategory ?? null,
+ categoryId: null,
datevAccount: null,
quantity: li.quantity,
unit: li.unit,
@@ -478,6 +512,7 @@
items: items.map((it) => ({
description: it.description,
category: it.category?.trim() || null,
+ categoryId: it.categoryId ?? null,
datevAccount: it.datevAccount?.trim() || null,
quantity: it.quantity,
unit: it.unit,
@@ -711,12 +746,23 @@
-
+
([]);
let vendors = $state([]);
@@ -109,6 +110,45 @@
dueDate: (r) => r.dueDate,
}),
);
+
+ let selectedIds = $state>(new Set());
+ let bulkBusy = $state(false);
+ let bulkDeleteConfirmOpen = $state(false);
+
+ const selectedExpenses = $derived(sortedExpenses.filter((e) => selectedIds.has(e.id)));
+ const canBulkMarkPaid = $derived(
+ selectedExpenses.length > 0 && selectedExpenses.every((e) => e.status === "open"),
+ );
+ const canBulkDelete = $derived(
+ selectedExpenses.length > 0 &&
+ selectedExpenses.every((e) => e.status === "draft" || e.status === "cancelled"),
+ );
+
+ function toggleSelect(id: number) {
+ const next = new Set(selectedIds);
+ if (next.has(id)) next.delete(id);
+ else next.add(id);
+ selectedIds = next;
+ }
+ function toggleSelectAll() {
+ if (selectedIds.size === sortedExpenses.length) selectedIds = new Set();
+ else selectedIds = new Set(sortedExpenses.map((e) => e.id));
+ }
+
+ async function bulkAction(label: string, fn: (id: number) => Promise) {
+ bulkBusy = true;
+ try {
+ for (const e of selectedExpenses) await fn(e.id);
+ toast.success(`${selectedExpenses.length} ${label}`);
+ selectedIds = new Set();
+ await reload();
+ } catch (e) {
+ toast.error("Bulk-Aktion fehlgeschlagen", String(e));
+ } finally {
+ bulkBusy = false;
+ bulkDeleteConfirmOpen = false;
+ }
+ }
@@ -161,6 +201,13 @@
{/if}
+
+ (selectedIds = new Set())}>
+ {#if canBulkMarkPaid}
+
+ {/if}
+ {#if canBulkDelete}
+
+ {/if}
+
+
+ bulkAction('gelöscht', deleteExpense)}
+/>
diff --git a/src/routes/Export.svelte b/src/routes/Export.svelte
index fb0cf22..72bbe1b 100644
--- a/src/routes/Export.svelte
+++ b/src/routes/Export.svelte
@@ -18,6 +18,7 @@
} from "$lib/ui";
import { loadInvoicesForExport } from "$lib/db/invoices";
import { loadExpensesForExport } from "$lib/db/expenses";
+ import { listCategories as listCuratedCategories, accountForSkr } from "$lib/db/expense-categories";
import {
ACCOUNT_MAPS,
buildDatevCsv,
@@ -60,9 +61,31 @@
const from = fromIsoDate(dateFromIso);
const toEnd = fromIsoDate(dateToIso) + 86399; // ganzen Tag inkludieren
const invoices = includeInvoices ? await loadInvoicesForExport(from, toEnd) : [];
- const expenses = includeExpenses
+ const rawExpenses = includeExpenses
? await loadExpensesForExport(from, toEnd, { includeCancelled })
: [];
+ // Curated-Category-Override: items mit categoryId bekommen das
+ // SKR-spezifische Konto. Explizites it.datevAccount (Override) gewinnt
+ // weiter — der Picker setzt es aber nur als SKR03-Default, also wenn
+ // der User SKR04 exportiert ohne den Wert manuell zu überschreiben,
+ // nimmt der Resolver hier das SKR04-Konto aus der Kategorie.
+ const categoriesById = new Map>[number]>();
+ if (includeExpenses) {
+ const cats = await listCuratedCategories({ includeArchived: true });
+ for (const c of cats) categoriesById.set(c.id, c);
+ }
+ const expenses = rawExpenses.map((e) => ({
+ ...e,
+ items: e.items.map((it) => {
+ if (it.categoryId && !it.datevAccount) {
+ const c = categoriesById.get(it.categoryId);
+ if (c) {
+ return { ...it, datevAccount: accountForSkr(c, skr) };
+ }
+ }
+ return it;
+ }),
+ }));
const total = invoices.length + expenses.length;
if (total === 0) {
toast.error(
diff --git a/src/routes/InvoiceEdit.svelte b/src/routes/InvoiceEdit.svelte
index b9e444d..5b9698f 100644
--- a/src/routes/InvoiceEdit.svelte
+++ b/src/routes/InvoiceEdit.svelte
@@ -107,6 +107,12 @@
let skontoEnabled = $state(false);
let skontoPercent = $state(2);
let skontoDays = $state(7);
+ let pdfLanguage = $state<"de" | "en">("de");
+
+ const pdfLanguageItems = [
+ { value: "de", label: "Deutsch" },
+ { value: "en", label: "Englisch" },
+ ];
async function fetchEcbRate() {
if (currency === "EUR") return;
@@ -190,6 +196,7 @@
skontoPercent = s.defaultSkontoPercent;
skontoDays = s.defaultSkontoDays;
}
+ pdfLanguage = s.defaultPdfLanguage;
}
})
.catch((e) => (error = String(e)));
@@ -236,6 +243,7 @@
skontoPercent = res.invoice.skontoPercent;
skontoDays = res.invoice.skontoDays;
}
+ pdfLanguage = (res.invoice.pdfLanguage ?? "de") as "de" | "en";
items = res.items.map((it) => {
const isSingle =
!!it.linePeriodStart &&
@@ -276,8 +284,9 @@
next.unit = it.unit;
next.unitPrice = it.defaultUnitPrice;
next.priceText = (it.defaultUnitPrice / 100).toFixed(2).replace(".", ",");
- if (it.descriptionDe) {
- next.longDescription = it.descriptionDe;
+ const desc = pdfLanguage === "en" && it.descriptionEn ? it.descriptionEn : it.descriptionDe;
+ if (desc) {
+ next.longDescription = desc;
next.showDetail = true;
}
items = [...items, next];
@@ -430,6 +439,7 @@
servicePeriodEnd: usePeriod ? fromIsoDate(servicePeriodEndIso) : null,
skontoPercent: skontoEnabled && !isCreditNote ? skontoPercent : null,
skontoDays: skontoEnabled && !isCreditNote ? skontoDays : null,
+ pdfLanguage,
};
let savedId: number;
if (mode === "new") {
@@ -822,6 +832,19 @@
+
+
|
+ |
ev.stopPropagation()}>
+ |
{e.internalNumber} | {e.number ?? "—"} | {formatDate(e.issueDate)} | @@ -193,3 +247,27 @@
|---|
+
+
+
{#if !isCreditNote}
@@ -881,4 +904,4 @@
{/if}
-(2);
let skontoDays = $state(7);
+ let pdfLanguage = $state<"de" | "en">("de");
+
+ const pdfLanguageItems = [
+ { value: "de", label: "Deutsch" },
+ { value: "en", label: "Englisch" },
+ ];
async function fetchEcbRate() {
if (currency === "EUR") return;
@@ -173,6 +179,7 @@
skontoPercent = s.defaultSkontoPercent;
skontoDays = s.defaultSkontoDays;
}
+ pdfLanguage = s.defaultPdfLanguage;
}
})
.catch((e) => (error = String(e)));
@@ -217,6 +224,7 @@
skontoPercent = res.offer.skontoPercent;
skontoDays = res.offer.skontoDays;
}
+ pdfLanguage = (res.offer.pdfLanguage ?? "de") as "de" | "en";
if (res.offer.servicePeriodStart && res.offer.servicePeriodEnd) {
serviceMode = "period";
servicePeriodStartIso = toIsoDate(res.offer.servicePeriodStart);
@@ -266,8 +274,9 @@
next.unit = it.unit;
next.unitPrice = it.defaultUnitPrice;
next.priceText = (it.defaultUnitPrice / 100).toFixed(2).replace(".", ",");
- if (it.descriptionDe) {
- next.longDescription = it.descriptionDe;
+ const desc = pdfLanguage === "en" && it.descriptionEn ? it.descriptionEn : it.descriptionDe;
+ if (desc) {
+ next.longDescription = desc;
next.showDetail = true;
}
items = [...items, next];
@@ -403,6 +412,7 @@
servicePeriodEnd: usePeriod ? fromIsoDate(servicePeriodEndIso) : null,
skontoPercent: skontoEnabled ? skontoPercent : null,
skontoDays: skontoEnabled ? skontoDays : null,
+ pdfLanguage,
};
let savedId: number;
if (mode === "new") {
@@ -794,6 +804,16 @@
+
+
+
+
@@ -849,4 +869,4 @@
{/if}
-([]);
let customers = $state([]);
@@ -117,6 +118,49 @@
validUntil: (r) => r.validUntil,
}),
);
+
+ let selectedIds = $state>(new Set());
+ let bulkBusy = $state(false);
+ let bulkDeleteConfirmOpen = $state(false);
+
+ const selectedOffers = $derived(sortedOffers.filter((o) => selectedIds.has(o.id)));
+
+ const canBulkMarkSent = $derived(
+ selectedOffers.length > 0 && selectedOffers.every((o) => o.status === "draft"),
+ );
+ const canBulkReject = $derived(
+ selectedOffers.length > 0 && selectedOffers.every((o) => o.status === "sent" || o.status === "draft"),
+ );
+ const canBulkDelete = $derived(
+ selectedOffers.length > 0 &&
+ selectedOffers.every((o) => o.status === "draft" || o.status === "rejected" || o.status === "expired"),
+ );
+
+ function toggleSelect(id: number) {
+ const next = new Set(selectedIds);
+ if (next.has(id)) next.delete(id);
+ else next.add(id);
+ selectedIds = next;
+ }
+ function toggleSelectAll() {
+ if (selectedIds.size === sortedOffers.length) selectedIds = new Set();
+ else selectedIds = new Set(sortedOffers.map((o) => o.id));
+ }
+
+ async function bulkAction(label: string, fn: (id: number) => Promise) {
+ bulkBusy = true;
+ try {
+ for (const o of selectedOffers) await fn(o.id);
+ toast.success(`${selectedOffers.length} ${label}`);
+ selectedIds = new Set();
+ await reload();
+ } catch (e) {
+ toast.error("Bulk-Aktion fehlgeschlagen", String(e));
+ } finally {
+ bulkBusy = false;
+ bulkDeleteConfirmOpen = false;
+ }
+ }
@@ -169,6 +213,13 @@
{/if}
+
+ (selectedIds = new Set())}>
+ {#if canBulkMarkSent}
+
+ {/if}
+ {#if canBulkReject}
+
+ {/if}
+ {#if canBulkDelete}
+
+ {/if}
+
+
+ bulkAction('gelöscht', deleteOffer)}
+/>
diff --git a/src/routes/settings/Advanced.svelte b/src/routes/settings/Advanced.svelte
index 47fe8bd..9b880b8 100644
--- a/src/routes/settings/Advanced.svelte
+++ b/src/routes/settings/Advanced.svelte
@@ -24,7 +24,7 @@
type WipeableTable,
} from "$lib/db/danger";
- const CURRENT_DB_SCHEMA_VERSION = 24;
+ const CURRENT_DB_SCHEMA_VERSION = 26;
type DangerAction =
| { kind: "wipeAll" }
diff --git a/src/routes/settings/Data.svelte b/src/routes/settings/Data.svelte
index bd2070c..7cb68c3 100644
--- a/src/routes/settings/Data.svelte
+++ b/src/routes/settings/Data.svelte
@@ -20,7 +20,7 @@
import { Download, Upload, FlaskConical, History } from "@lucide/svelte";
import { loadSettings, saveSettings } from "$lib/db/queries";
- const CURRENT_DB_SCHEMA_VERSION = 24;
+ const CURRENT_DB_SCHEMA_VERSION = 26;
let sandbox = $state(false);
let sandboxBusy = $state(false);
diff --git a/src/routes/settings/Documents.svelte b/src/routes/settings/Documents.svelte
index 1507e3a..c1ea24a 100644
--- a/src/routes/settings/Documents.svelte
+++ b/src/routes/settings/Documents.svelte
@@ -33,6 +33,11 @@
{ value: "minimal", label: "Minimal" },
];
+ const pdfLanguageItems = [
+ { value: "de", label: "Deutsch" },
+ { value: "en", label: "Englisch" },
+ ];
+
$effect(() => {
loadSettings()
.then((row) => (s = row))
@@ -185,6 +190,19 @@
Beeinflusst nur die visuelle Darstellung der PDF — das eingebettete ZUGFeRD-XML bleibt unverändert.
+
+ |
+ |
e.stopPropagation()}>
+ |
{off.number} | {formatDate(off.issueDate)} | {off.customerName} | @@ -197,3 +255,33 @@
|---|
+
+