Database: Adapt to changes for examples in WLNS

Elwig/App.xaml.cs

@@ -201,6 +201,7 @@ namespace Elwig {
             BranchName = entry.Item2;
             BranchPlz = entry.Item3;
             BranchLocation = entry.Item4?
+                .Split(",")[0]
                 .Split(" in ")[0]
                 .Split(" im ")[0]
                 .Split(" an ")[0]

Elwig/Documents/CreditNote.cs

@@ -321,7 +321,7 @@ namespace Elwig.Documents {
                         var totalMod = p.TotalModifiers ?? 0;
                         var pad = i == 0 ? 0.5f : 0;
                         sub.AddCell(NewTd(rebelMod == 0 ? "-" : (Utils.GetSign(rebelMod) + $"{Math.Abs(rebelMod):0.0##}"), 6, center: true)
-                                .SetPaddingTopMM(pad))
+                                .SetPaddingTopMM(pad).SetPaddingLeft(0).SetPaddingRight(0))
                             .AddCell(NewTd(totalMod == 0 ? "-" : Utils.GetSign(totalMod) + $"{Math.Abs(totalMod):N2}", center: totalMod == 0, right: true)
                                 .SetPaddingTopMM(pad))
                             .AddCell(NewTd($"{p.Amount:N2}", right: true)

Elwig/Documents/PaymentVariantSummary.cs

@@ -183,21 +183,21 @@ namespace Elwig.Documents {
                 .AddCell(NewTd(CurrencySymbol))
                 .AddCell(NewTd($"{Math.Abs(payed):N2}", right: true))
                 .AddCell(NewSectionTh("Preis (abgewertet):", borderTop: true, borderLeft: true))
-                .AddCell(NewTd((minWei != maxWei ? $"{minWei:N4}\u2013{maxWei:N4}" : $"{minWei:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true, borderTop: true))
+                .AddCell(NewTd(minWei == null && maxWei == null ? "-" : (minWei != maxWei ? $"{minWei:N4}\u2013{maxWei:N4}" : $"{minWei:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true, borderTop: true))
 
                 .AddCell(NewSectionTh("Nettosumme:", colspan: 2))
                 .AddCell(NewTd(borderTop: true))
                 .AddCell(NewTd(CurrencySymbol, borderTop: true))
                 .AddCell(NewTd($"{netSum:N2}", right: true, borderTop: true))
                 .AddCell(NewSectionTh("Preis (ungeb., nicht abgew.):", borderLeft: true))
-                .AddCell(NewTd((minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true))
+                .AddCell(NewTd(minPrice == null && maxPrice == null ? "-" : (minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true))
 
                 .AddCell(NewSectionTh("Mehrwertsteuer:", colspan: 2))
                 .AddCell(NewTd(Utils.GetSign(vat), right: true))
                 .AddCell(NewTd(CurrencySymbol))
                 .AddCell(NewTd($"{Math.Abs(vat):N2}", right: true))
                 .AddCell(NewSectionTh("Gebunden-Zuschlag:", borderLeft: true))
-                .AddCell(NewTd(minGeb != maxGeb ? $"{minGeb:N4}\u2013{maxGeb:N4} {CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {CurrencySymbol}/kg", colspan: 2, center: true))
+                .AddCell(NewTd(minGeb == null && maxGeb == null ? "-" : minGeb != maxGeb ? $"{minGeb:N4}\u2013{maxGeb:N4} {CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {CurrencySymbol}/kg", colspan: 2, center: true))
 
                 .AddCell(NewSectionTh("Bruttosumme:", colspan: 2))
                 .AddCell(NewTd(borderTop: true))

Elwig/Helpers/AppDbUpdater.cs

@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 38;
+        public static readonly int RequiredSchemaVersion = 39;
 
         private static int VersionOffset = 0;
 

Elwig/Helpers/Billing/BillingVariant.cs

@@ -232,7 +232,7 @@ namespace Elwig.Helpers.Billing {
                 SET mod_rel = mod_rel + excluded.mod_rel;
 
                 INSERT INTO payment_delivery_part (year, did, dpnr, avnr, net_amount, mod_abs, mod_rel)
-                SELECT d.year, d.did, d.dpnr, {AvNr}, 0, COALESCE(m.abs, 0), COALESCE(m.rel, 0)
+                SELECT d.year, d.did, d.dpnr, {AvNr}, 0, COALESCE(m.abs, 0) * d.weight, 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.year, m.modid) = (d.year, p.modid)

Elwig/Resources/Sql/38-39.sql

@@ -0,0 +1,8 @@
+-- schema version 38 to 39
+
+PRAGMA writable_schema = ON;
+UPDATE sqlite_schema SET sql = REPLACE(sql, '{2,}', '{2,64}')
+WHERE type = 'table' AND name = 'member_email_address';
+PRAGMA writable_schema = OFF;
+
+UPDATE wb_gem SET hkid = 'WLLB' WHERE gkz IN (10710, 10723);