From c816ea3ac9f8c1d8c391ff53ae31a0c74c2df675 Mon Sep 17 00:00:00 2001 From: oliver Date: Mon, 12 Oct 2026 10:12:46 -0300 Subject: [PATCH] eg --- README.md | 2 +- index.html | 20 -------------------- sql/Quartal_Schweiz.sql | 35 +++++++++++++++++++++++------------ 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 8046eb4..2f717e9 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ The left sidebar groups reports by topic: - **Amazon** → *VAT Summary* (USt-Übersicht je Land) - **ODOO** → *Rechnungen pro Monat* (Pivot über Odoo-Rechnungen) - **Gesamt** → *Alle Rechnungen pro Monat* (PivotTable.js-Experiment) -- **Schweiz** → *Quartal Schweiz* (AMAZON + ODOO, Lieferung in die Schweiz) +- **Gesamt** → *Quartal Schweiz* (AMAZON + ODOO, Lieferung in die Schweiz) All groups start collapsed, so no submenu is visible when the page opens. Clicking a topic expands its submenu; clicking a submenu item switches the diff --git a/index.html b/index.html index b9a57c4..03ec31b 100644 --- a/index.html +++ b/index.html @@ -94,26 +94,6 @@ Alle Rechnungen pro Monat - - - - -
- -
Quartal Schweiz diff --git a/sql/Quartal_Schweiz.sql b/sql/Quartal_Schweiz.sql index ac1d783..355737b 100644 --- a/sql/Quartal_Schweiz.sql +++ b/sql/Quartal_Schweiz.sql @@ -22,6 +22,13 @@ -- In psql stattdessen: -- \set quarter '2026-Q3' -- +-- Diagnose (falls keine AMAZON-Zeilen geliefert werden): +-- SELECT activity_period, count(*) +-- FROM brandize_datacenter_amazon_vat_transaction +-- WHERE arrival_country = 'CH' OR sale_arrival_country = 'CH' +-- GROUP BY 1 ORDER BY 1; +-- -- zeigt das tatsaechliche Format von activity_period +-- -- --------------------------------------------------------------------------- -- Spalten-Mapping ODOO -> AMAZON -- (Felder ohne Amazon-Pendant bleiben leer) @@ -67,18 +74,20 @@ quarters AS ( make_date(yr::int, (qn - 1) * 3 + 1, 1) + INTERVAL '3 months' AS next_day FROM params ), --- Die drei activity_period-Werte (Format 'YYYY-MMM', deutsche Kuerzel) fuer die --- Amazon-Tabelle. qmonths AS ( - SELECT - q.yr || '-' || CASE ((q.qn - 1) * 3 + m.m) - WHEN 1 THEN 'JAN' WHEN 2 THEN 'FEB' WHEN 3 THEN 'MÄR' - WHEN 4 THEN 'APR' WHEN 5 THEN 'MAI' WHEN 6 THEN 'JUN' - WHEN 7 THEN 'JUL' WHEN 8 THEN 'AUG' WHEN 9 THEN 'SEP' - WHEN 10 THEN 'OKT' WHEN 11 THEN 'NOV' WHEN 12 THEN 'DEZ' - END AS activity_period + -- Alle moeglichen Schreibweisen der 3 Quartalsmonate als 'YYYY-MMM' + -- (deutsche UND englische Kuerzel, da die gespeicherte Schreibweise je + -- nach Herkunft abweichen kann). + SELECT DISTINCT + q.yr || '-' || v.abbr AS activity_period FROM quarters q - CROSS JOIN generate_series(1, 3) AS m(m) + CROSS JOIN generate_series(1, 3) AS g(n) + JOIN (VALUES + (1, 'JAN'), (2, 'FEB'), (3, 'MÄR'), (3, 'MAR'), (4, 'APR'), + (5, 'MAI'), (5, 'MAY'), (6, 'JUN'), (7, 'JUL'), (8, 'AUG'), + (9, 'SEP'), (10, 'OKT'), (10, 'OCT'), (11, 'NOV'), + (12, 'DEZ'), (12, 'DEC') + ) AS v(mnum, abbr) ON v.mnum = (q.qn - 1) * 3 + g.n ), -- =========================================================================== @@ -345,8 +354,10 @@ amazon_base AS ( ELSE 0 END AS rate FROM brandize_datacenter_amazon_vat_transaction a - WHERE a.activity_period IN (SELECT activity_period FROM qmonths) - AND a.arrival_country = 'CH' + WHERE upper(a.activity_period) IN (SELECT upper(activity_period) FROM qmonths) + -- Lieferung in die Schweiz: Ziel-/Versandland kann in arrival_country + -- oder sale_arrival_country stehen. + AND (upper(a.arrival_country) = 'CH' OR upper(a.sale_arrival_country) = 'CH') -- Optional: Gebuehrenzeilen ausschliessen (wie in VAT_Summary.sql): -- AND a.sales_channel <> 'AMAZON_FEE' ),