From b723161fa538b575d8cafc8635589783f2ce514a Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Mon, 8 Jan 2024 02:40:32 +0100
Subject: [PATCH] BillingVariant: Fix CalculateModifiers() by restricting
modifier year
---
Elwig/Helpers/Billing/BillingVariant.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Elwig/Helpers/Billing/BillingVariant.cs b/Elwig/Helpers/Billing/BillingVariant.cs
index 2e0bda0..b0bb84f 100644
--- a/Elwig/Helpers/Billing/BillingVariant.cs
+++ b/Elwig/Helpers/Billing/BillingVariant.cs
@@ -168,7 +168,7 @@ namespace Elwig.Helpers.Billing {
SELECT d.year, d.did, d.dpnr, {AvNr}, 0, COALESCE(m.abs, 0), COALESCE(m.rel, 0)
FROM delivery_part d
LEFT JOIN delivery_part_modifier p ON (p.year, p.did, p.dpnr) = (d.year, d.did, d.dpnr)
- LEFT JOIN modifier m ON m.modid = p.modid
+ LEFT JOIN modifier m ON (m.year, m.modid) = (d.year, p.modid)
WHERE d.year = {Year}
ON CONFLICT DO UPDATE
SET mod_abs = mod_abs + excluded.mod_abs,