Changelog: Use '-' instead of '*'

Elwig/App.xaml.cs

@@ -394,15 +394,15 @@ namespace Elwig {
             return FocusWindow<DeliveryAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember?.MgNr == mgnr);
         }
 
-        public static AreaComAdminWindow FocusMemberAreaComs(int mgnr) {
+        public static AreaCmtAdminWindow FocusMemberAreaCmts(int mgnr) {
-            return FocusWindow<AreaComAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember.MgNr == mgnr);
+            return FocusWindow<AreaCmtAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember.MgNr == mgnr);
         }
 
         public static BaseDataWindow FocusBaseData() {
             return FocusWindow<BaseDataWindow>(() => new());
         }
 
-        public static BaseDataWindow FocusBaseDataAreaComType() {
+        public static BaseDataWindow FocusBaseDataAreaCmtType() {
             var w = FocusBaseData();
             w.AreaCommitmentTypes.Focus();
             return w;

Elwig/Dialogs/AreaCmtModifyDialog.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="Elwig.Dialogs.AreaComModifyDialog"
+<Window x:Class="Elwig.Dialogs.AreaCmtModifyDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

Elwig/Dialogs/AreaCmtModifyDialog.xaml.cs

@@ -4,7 +4,7 @@ using System.Windows;
 using System.Windows.Controls;
 
 namespace Elwig.Dialogs {
-    public partial class AreaComModifyDialog : Window {
+    public partial class AreaCmtModifyDialog : Window {
 
         public int? YearTo { get; set; }
         public bool ModifyRetroactively { get; set; }
@@ -13,7 +13,7 @@ namespace Elwig.Dialogs {
         public string OrigYearTo { get; set; }
         public string Area { get; set; }
 
-        public AreaComModifyDialog(int? yearFrom, int? yearTo, int area, bool delete, bool forceRetroactive = false) {
+        public AreaCmtModifyDialog(int? yearFrom, int? yearTo, int area, bool delete, bool forceRetroactive = false) {
             Area = $"{area:N0}";
             OrigYearFrom = $"{yearFrom}";
             OrigYearTo = $"{yearTo}";

Elwig/Dialogs/AreaCmtTransferDialog.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="Elwig.Dialogs.AreaComTransferDialog"
+<Window x:Class="Elwig.Dialogs.AreaCmtTransferDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -35,11 +35,11 @@
         <TextBlock x:Name="QuestionBlock1" TextAlignment="Center" Margin="0,10,0,0"
                    HorizontalAlignment="Center" VerticalAlignment="Top">
             Sollen die aktiven Flächenbindungen des angegebenen Vorgängers<LineBreak/>
-            übernommen werden? (<Run Text="{Binding AreaComNum}"/> FB, <Run Text="{Binding Area}"/> m²)
+            übernommen werden? (<Run Text="{Binding AreaCmtNum}"/> FB, <Run Text="{Binding Area}"/> m²)
         </TextBlock>
         <TextBlock x:Name="QuestionBlock2" TextAlignment="Center" Margin="0,10,0,0" Visibility="Hidden"
                    HorizontalAlignment="Center" VerticalAlignment="Top">
-            Sollen die aktiven Flächenbindungen gekündigt werden? (<Run Text="{Binding AreaComNum}"/> FB, <Run Text="{Binding Area}"/> m²)
+            Sollen die aktiven Flächenbindungen gekündigt werden? (<Run Text="{Binding AreaCmtNum}"/> FB, <Run Text="{Binding Area}"/> m²)
         </TextBlock>
 
         <Label x:Name="SeasonLabel" Content="Saison:" Margin="0,50,100,0"

Elwig/Dialogs/AreaCmtTransferDialog.xaml.cs

@@ -3,17 +3,17 @@ using System.Windows;
 using System.Windows.Controls;
 
 namespace Elwig.Dialogs {
-    public partial class AreaComTransferDialog : Window {
+    public partial class AreaCmtTransferDialog : Window {
 
         public int CancelSeason => SuccessorSeason - 1;
         public int SuccessorSeason { get; set; }
 
-        public string AreaComNum { get; set; }
+        public string AreaCmtNum { get; set; }
         public string Area { get; set; }
 
-        public AreaComTransferDialog(string name, int areaComNum, int area) {
+        public AreaCmtTransferDialog(string name, int areaCmtNum, int area) {
             SuccessorSeason = Utils.FollowingSeason;
-            AreaComNum = $"{areaComNum:N0}";
+            AreaCmtNum = $"{areaCmtNum:N0}";
             Area = $"{area:N0}";
             InitializeComponent();
             SeasonInput.Text = $"{SuccessorSeason}";
@@ -28,9 +28,9 @@ namespace Elwig.Dialogs {
             SeasonLabel.Margin = new(0, 40, 100, 0);
         }
 
-        public AreaComTransferDialog(string name, string successorName, int areaComNum, int area) {
+        public AreaCmtTransferDialog(string name, string successorName, int areaCmtNum, int area) {
             SuccessorSeason = Utils.FollowingSeason;
-            AreaComNum = $"{areaComNum:N0}";
+            AreaCmtNum = $"{areaCmtNum:N0}";
             Area = $"{area:N0}";
             InitializeComponent();
             SeasonInput.Text = $"{SuccessorSeason}";

Elwig/Dialogs/DeleteMemberDialog.xaml

@@ -47,9 +47,9 @@
                  TextChanged="NameInput_TextChanged"/>
 
         <Label Content="Beim Löschen müssen folgende Daten auch gelöscht werden:" Margin="10,120,10,10"/>
-        <CheckBox x:Name="AreaComInput" Content="Flächenbindungen" Margin="40,145,0,0"
+        <CheckBox x:Name="AreaCmtInput" Content="Flächenbindungen" Margin="40,145,0,0"
                   Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                  IsChecked="{Binding DeleteAreaComs}"/>
+                  IsChecked="{Binding DeleteAreaCmts}"/>
         <CheckBox x:Name="DeliveryInput" Content="Lieferungen" Margin="40,165,0,0"
                   Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                   IsChecked="{Binding DeleteDeliveries}"/>

Elwig/Dialogs/DeleteMemberDialog.xaml.cs

@@ -8,16 +8,16 @@ namespace Elwig.Dialogs {
 
         protected string[] NameParts;
 
-        public bool DeleteAreaComs { get; set; }
+        public bool DeleteAreaCmts { get; set; }
         public bool DeleteDeliveries { get; set; }
         public bool DeletePaymentData { get; set; }
 
-        public DeleteMemberDialog(int mgnr, string name, int numAreaComs, int numDeliveries, int numCredits) {
+        public DeleteMemberDialog(int mgnr, string name, int numAreaCmts, int numDeliveries, int numCredits) {
             NameParts = name.ToLower().Split(' ').Where(p => p.Length > 0).Append($"{mgnr}").ToArray();
             InitializeComponent();
             Title += " - " + name;
-            AreaComInput.IsEnabled = numAreaComs != 0;
+            AreaCmtInput.IsEnabled = numAreaCmts != 0;
-            AreaComInput.Content += $" ({numAreaComs:N0})";
+            AreaCmtInput.Content += $" ({numAreaCmts:N0})";
             DeliveryInput.IsEnabled = numDeliveries != 0;
             DeliveryInput.Content += $" ({numDeliveries:N0})";
             PaymentInput.IsEnabled = numCredits != 0;
@@ -43,7 +43,7 @@ namespace Elwig.Dialogs {
         private void Update() {
             var t = NameInput.Text.ToLower().Split(' ');
             var nameValid = NameParts.All(t.Contains);
-            UpdateCheckBox(AreaComInput);
+            UpdateCheckBox(AreaCmtInput);
             UpdateCheckBox(DeliveryInput);
             UpdateCheckBox(PaymentInput);
             if (!nameValid) {
@@ -52,7 +52,7 @@ namespace Elwig.Dialogs {
                 ControlUtils.ClearInputState(NameInput);
             }
             ConfirmButton.IsEnabled =
-                (!AreaComInput.IsEnabled || DeleteAreaComs) &&
+                (!AreaCmtInput.IsEnabled || DeleteAreaCmts) &&
                 (!DeliveryInput.IsEnabled || DeleteDeliveries) &&
                 (!PaymentInput.IsEnabled || DeletePaymentData) &&
                 nameValid;

Elwig/Documents/BusinessDocument.cs

@@ -77,13 +77,13 @@ namespace Elwig.Documents {
                     .AddCell(NewAsideCell("Betr.-Nr.:", 6, isName: true)).AddCell(NewAsideCell(Member.LfbisNr ?? "-", 6, right: true, center: Member.LfbisNr == null))
                     .AddCell(NewAsideCell("OOC-ID:", 6, isName: true)).AddCell(NewAsideCell(Member.OrganicOperatorId ?? "-", 8, right: true, center: Member.OrganicOperatorId == null))
                     .AddCell(NewAsideCell("UID:", 6, isName: true)).AddCell(NewAsideCell(Member.UstIdNr ?? "-", 10, right: true, center: Member.UstIdNr == null))
-                    .AddCell(NewAsideCell(new KernedParagraph("", 10).Add(Italic(Member.IsBuchführend ? "(buchführend)" : "(pauschaliert)")), 10, center: true));
+                    .AddCell(NewAsideCell(new KernedParagraph("", 10).Add(Italic(Member.IsAccounting ? "(buchführend)" : "(pauschaliert)")), 10, center: true));
             } else {
                 Aside
                     .AddCell(NewAsideCell("Mitglieds-Nr.:", 12, isName: true)).AddCell(NewAsideCell($"{Member.MgNr}", 4, right: true)).AddCell(NewAsideCell("", 10))
                     .AddCell(NewAsideCell("Betriebs-Nr.:", 10, isName: true)).AddCell(NewAsideCell(Member.LfbisNr ?? "-", 6, right: true, center: Member.LfbisNr == null)).AddCell(NewAsideCell("", 10))
                     .AddCell(NewAsideCell("UID:", 6, isName: true)).AddCell(NewAsideCell(Member.UstIdNr ?? "-", 10, right: true, center: Member.UstIdNr == null))
-                    .AddCell(NewAsideCell(new KernedParagraph("", 10).Add(Italic(Member.IsBuchführend ? "(buchführend)" : "(pauschaliert)")), 10, center: true));
+                    .AddCell(NewAsideCell(new KernedParagraph("", 10).Add(Italic(Member.IsAccounting ? "(buchführend)" : "(pauschaliert)")), 10, center: true));
             }
         }
 

Elwig/Documents/MemberDataSheet.cs

@@ -23,7 +23,7 @@ namespace Elwig.Documents {
         public int MemberDeliveredWeightWhite;
         public List<MemberHistory> MemberHistory = [];
         public Dictionary<string, MemberBucket> MemberBuckets = [];
-        public List<AreaCom> ActiveAreaCommitments = [];
+        public List<AreaCmt> ActiveAreaCommitments = [];
 
         public MemberDataSheet(Member m) :
             base($"{Name} {m.AdministrativeName}", m, DateOnly.FromDateTime(m.ModifiedAt)) {
@@ -68,7 +68,7 @@ namespace Elwig.Documents {
                     firstOnPage = true;
                 }
                 doc.Add(new KernedParagraph(12).Add(Bold($"Flächenbindungen per {Date:dd.MM.yyyy}")).SetMargins(firstOnPage ? 0 : 24, 0, 6, 0));
-                doc.Add(NewAreaComTable(ActiveAreaCommitments));
+                doc.Add(NewAreaCmtTable(ActiveAreaCommitments));
             }
             if (App.Client.EnableMemberHistory) {
                 bool firstOnPage = false;
@@ -158,8 +158,8 @@ namespace Elwig.Documents {
                 .AddCell(NewDataTh("Betriebs-Nr.:")).AddCell(NewTd(Member.LfbisNr))
                 .AddCell(NewDataTh("UID:", colspan: 2)).AddCell(NewTd(Member.UstIdNr, colspan: 2))
                 .AddCell(NewDataTh("Stammgemeinde:")).AddCell(NewTd(Member.DefaultKg?.Name))
-                .AddCell(NewDataTh("Buchführend:", colspan: 2)).AddCell(NewTd(new KernedParagraph(Member.IsBuchführend ? "Ja " : "Nein ", 10)
+                .AddCell(NewDataTh("Buchführend:", colspan: 2)).AddCell(NewTd(new KernedParagraph(Member.IsAccounting ? "Ja " : "Nein ", 10)
-                    .Add(Normal($"({(Member.IsBuchführend ? season.VatNormal : season.VatFlatrate) * 100:N0}% USt.)", 8)), colspan: 2))
+                    .Add(Normal($"({(Member.IsAccounting ? season.VatNormal : season.VatFlatrate) * 100:N0}% USt.)", 8)), colspan: 2))
                 .AddCell(NewDataTh("(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)", 8, colspan: 2))
                 .AddCell(NewDataTh("Bio:", colspan: 2)).AddCell(NewTd(new KernedParagraph(Member.IsOrganic ? "Ja" : "Nein", 10)
                     .Add(Normal(Member.OrganicAuthorityCode != null || Member.OrganicOperatorId != null ? $" ({Member.OrganicAuthorityCode}{(Member.OrganicAuthorityCode != null && Member.OrganicOperatorId != null ? ", " : "")}{Member.OrganicOperatorId})" : "", 8)), colspan: 2))
@@ -168,19 +168,19 @@ namespace Elwig.Documents {
                     .Add(Normal("(" + (Member.ExitDate != null ? $"{Member.EntryDate:dd.MM.yyyy}\u2013{Member.ExitDate:dd.MM.yyyy}" : $"seit {Member.EntryDate:dd.MM.yyyy}") + ")", 8))))
                 .AddCell(NewDataTh("Geschäftsanteile:", colspan: 2)).AddCell(NewTd(shares, colspan: 2))
                 .AddCell(NewDataTh("Stamm-Zweigstelle:")).AddCell(NewTd(Member.Branch?.Name))
-                .AddCell(NewDataTh("Volllieferant:", colspan: 2)).AddCell(NewTd(Member.IsVollLieferant ? "Ja" : "Nein", colspan: 2))
+                .AddCell(NewDataTh("Vollablieferer:", colspan: 2)).AddCell(NewTd(Member.IsFullDelivery ? "Ja" : "Nein", colspan: 2))
                 .AddCell(NewDataTh("Zusendungen per\u2026")).AddCell(NewTd(new KernedParagraph(10)
                     .Add(Italic("Post:")).Add(Normal(Member.ContactViaPost ? " Ja \u2013 " : " Nein \u2013 "))
                     .Add(Italic("E-Mail:")).Add(Normal(Member.ContactViaEmail ? " Ja" : " Nein"))))
-                .AddCell(NewDataTh("Funktionär:", colspan: 2)).AddCell(NewTd(Member.IsFunktionär ? "Ja" : "Nein", colspan: 2));
+                .AddCell(NewDataTh("Funktionär:", colspan: 2)).AddCell(NewTd(Member.IsOfficer ? "Ja" : "Nein", colspan: 2));
 
             return tbl;
         }
 
-        protected Table NewAreaComTable(IEnumerable<AreaCom> activeAreaComs) {
+        protected Table NewAreaCmtTable(IEnumerable<AreaCmt> activeAreaCmts) {
-            var areaComs = activeAreaComs.GroupBy(a => a.AreaComType).Select(group => new {
+            var areaCmts = activeAreaCmts.GroupBy(a => a.AreaCmtType).Select(group => new {
                 Type = group.Key,
-                AreaComs = group.OrderBy(c => c.Contract.Kg.AtKg.Name).ToList(),
+                AreaCmts = group.OrderBy(c => c.Contract.Kg.AtKg.Name).ToList(),
                 Size = group.Sum(c => c.Area)
             }).OrderByDescending(a => a.Size).ToList();
 
@@ -199,7 +199,7 @@ namespace Elwig.Documents {
                 .AddHeaderCell(NewTh("[m²]"));
 
             var lastContract = "";
-            foreach (var contractType in areaComs) {
+            foreach (var contractType in areaCmts) {
                 tbl.AddCell(NewCell(new KernedParagraph(10).Add(BoldItalic($"{contractType.Type.WineVar.Name} {(contractType.Type.WineAttr != null ? "(" + contractType.Type.WineAttr + ")" : "")}")), colspan: 3)
                         .SetBorderTop(contractType.Type.DisplayName != lastContract && lastContract != "" ? new SolidBorder(BorderThickness) : Border.NO_BORDER))
                     .AddCell(NewCell(new KernedParagraph(10).Add(Bold($"{contractType.Size:N0}")).SetTextAlignment(TextAlignment.RIGHT))
@@ -207,20 +207,20 @@ namespace Elwig.Documents {
                     .AddCell(NewCell(colspan: 2)
                         .SetBorderTop(contractType.Type.DisplayName != lastContract && lastContract != "" ? new SolidBorder(BorderThickness) : Border.NO_BORDER));
 
-                foreach (var areaCom in contractType.AreaComs) {
+                foreach (var areaCmt in contractType.AreaCmts) {
-                    var c = areaCom.Contract;
+                    var c = areaCmt.Contract;
                     tbl.AddCell(NewTd(new KernedParagraph(10).Add(Normal($"{c.Kg.AtKg.Name} ")).Add(Normal($"({c.Kg.AtKg.KgNr:00000})", 8))))
                         .AddCell(NewTd(c.Rd?.Name))
-                        .AddCell(NewTd(Regex.Replace(areaCom.GstNr.Replace(",", ", ").Replace("-", "\u2013"), @"\s+", " "), 10))
+                        .AddCell(NewTd(Regex.Replace(areaCmt.GstNr.Replace(",", ", ").Replace("-", "\u2013"), @"\s+", " "), 10))
-                        .AddCell(NewTd($"{areaCom.Area:N0}", right: true))
+                        .AddCell(NewTd($"{areaCmt.Area:N0}", right: true))
-                        .AddCell(NewTd(areaCom.WineCult?.Name, center: true))
+                        .AddCell(NewTd(areaCmt.WineCult?.Name, center: true))
                         .AddCell(NewTd(c.YearTo == null ? (c.YearFrom == null ? "unbefristet" : $"ab {c.YearFrom}") : (c.YearFrom == null ? $"bis {c.YearTo}" : $"{c.YearFrom}–{c.YearTo}"), center: true));
                     lastContract = contractType.Type.DisplayName;
                 }
             }
 
             tbl.AddCell(NewTd("Gesamt:", 12, colspan: 2, bold: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
-            tbl.AddCell(NewTd($"{activeAreaComs.Sum(a => a.Area):N0}", 12, colspan: 2, right: true, bold: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
+            tbl.AddCell(NewTd($"{activeAreaCmts.Sum(a => a.Area):N0}", 12, colspan: 2, right: true, bold: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
             tbl.AddCell(NewTd(colspan: 2, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
 
             return tbl;

Elwig/Documents/MemberList.cs

@@ -16,14 +16,14 @@ namespace Elwig.Documents {
         public string Filter;
         public List<MemberListRow> Members;
 
-        public string[] AreaComFilters;
+        public string[] AreaCmtFilters;
-        public bool FilterAreaComs => AreaComFilters.Length > 0;
+        public bool FilterAreaCmts => AreaCmtFilters.Length > 0;
 
         public MemberList(string filter, IEnumerable<MemberListRow> members) :
             base(Name) {
             Filter = filter;
             Members = [.. members];
-            AreaComFilters = [..members
+            AreaCmtFilters = [..members
                 .SelectMany(m => m.AreaCommitmentsFiltered)
                 .Select(c => c.VtrgId)
                 .Distinct()
@@ -46,11 +46,11 @@ namespace Elwig.Documents {
         }
 
         protected Table NewMemberTable(List<MemberListRow> members) {
-            var tbl = new Table(AreaComFilters.Length > 1 ? ColsMM(8, 38, 36, 8, 18, 12, 5, 16, 12, 12) : ColsMM(8, 42, 40, 8, 20, 12, 5, 18, 12), true)
+            var tbl = new Table(AreaCmtFilters.Length > 1 ? ColsMM(8, 38, 36, 8, 18, 12, 5, 16, 12, 12) : ColsMM(8, 42, 40, 8, 20, 12, 5, 18, 12), true)
                 .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
                 .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
 
-            var headerSpan = FilterAreaComs ? 3 : 2;
+            var headerSpan = FilterAreaCmts ? 3 : 2;
             tbl.AddHeaderCell(NewTh("Nr.", rowspan: headerSpan))
                 .AddHeaderCell(NewTh("Name", rowspan: headerSpan, left: true))
                 .AddHeaderCell(NewTh("Adresse", rowspan: headerSpan, left: true))
@@ -59,21 +59,21 @@ namespace Elwig.Documents {
                 .AddHeaderCell(NewTh("Betr.-Nr.", rowspan: headerSpan))
                 .AddHeaderCell(NewTh("GA", rowspan: headerSpan).SetPaddingLeft(0).SetPaddingRight(0))
                 .AddHeaderCell(NewTh("Stamm-KG", rowspan: headerSpan, left: true))
-                .AddHeaderCell(NewTh("Geb. Fl.", colspan: FilterAreaComs ? AreaComFilters.Length : 1));
+                .AddHeaderCell(NewTh("Geb. Fl.", colspan: FilterAreaCmts ? AreaCmtFilters.Length : 1));
-            if (FilterAreaComs) {
+            if (FilterAreaCmts) {
-                foreach (var vtrgId in AreaComFilters) {
+                foreach (var vtrgId in AreaCmtFilters) {
                     tbl.AddHeaderCell(NewTh(vtrgId));
                 }
             }
-            for (int i = 0; i < (FilterAreaComs ? AreaComFilters.Length : 1); i++) {
+            for (int i = 0; i < (FilterAreaCmts ? AreaCmtFilters.Length : 1); i++) {
                 tbl.AddHeaderCell(NewTh("[m²]"));
             }
 
             string? lastBranch = members.Select(m => m.Branch).Distinct().Count() == 1 ? null : "";
             foreach (var m in members) {
                 if (lastBranch != null && m.Branch != lastBranch) {
-                    tbl.AddCell(NewCell(colspan: 8 + Math.Max(AreaComFilters.Length, 1)).SetHeightMM(5).SetKeepWithNext(true));
+                    tbl.AddCell(NewCell(colspan: 8 + Math.Max(AreaCmtFilters.Length, 1)).SetHeightMM(5).SetKeepWithNext(true));
-                    tbl.AddCell(NewCell(new KernedParagraph(m.Branch ?? "", 16).SetFont(BF), colspan: 8 + Math.Max(AreaComFilters.Length, 1))
+                    tbl.AddCell(NewCell(new KernedParagraph(m.Branch ?? "", 16).SetFont(BF), colspan: 8 + Math.Max(AreaCmtFilters.Length, 1))
                         .SetPaddingsMM(1, 2, 1, 2)
                         .SetBorder(new SolidBorder(BorderThickness))
                         .SetBackgroundColor(new DeviceRgb(0xe0, 0xe0, 0xe0)));
@@ -88,8 +88,8 @@ namespace Elwig.Documents {
                     .AddCell(NewTd(m.LfbisNr ?? "", 8))
                     .AddCell(NewTd($"{m.SharesActive:N0}", 8, right: true).SetPaddingLeft(0).SetPaddingRight(0))
                     .AddCell(NewTd(m.DefaultKg ?? "", 6));
-                if (AreaComFilters.Length > 0) {
+                if (AreaCmtFilters.Length > 0) {
-                    foreach (var v in AreaComFilters) {
+                    foreach (var v in AreaCmtFilters) {
                         tbl.AddCell(NewTd($"{m.AreaCommitmentsFiltered.FirstOrDefault(c => c.VtrgId == v).Area:N0}", 8, right: true));
                     }
                 } else {
@@ -101,7 +101,7 @@ namespace Elwig.Documents {
                         .AddCell(NewTd(m.BillingAddress ?? "", 8))
                         .AddCell(NewTd($"{m.BillingPlz}", 8))
                         .AddCell(NewTd(m.BillingLocality ?? "", 6))
-                        .AddCell(NewTd(colspan: 3 + Math.Max(AreaComFilters.Length, 1)));
+                        .AddCell(NewTd(colspan: 3 + Math.Max(AreaCmtFilters.Length, 1)));
                 }
             }
 

Elwig/Documents/PaymentVariantSummary.cs

@@ -108,16 +108,16 @@ namespace Elwig.Documents {
             var totalSum = _credits.Sum(p => p.Amount);
 
             var weiRows = data.Rows.Where(r => r.QualityLevel == "Wein");
-            var minWei = weiRows.Min(r => r.Ungeb.MinPrice);
+            var minWei = weiRows.Min(r => r.UnCtrd.MinPrice);
-            var maxWei = weiRows.Max(r => r.Ungeb.MaxPrice);
+            var maxWei = weiRows.Max(r => r.UnCtrd.MaxPrice);
             var quwRows = data.Rows.Where(r => r.QualityLevel != "Wein");
-            var minPrice = quwRows.Min(r => r.Ungeb.MinPrice);
+            var minPrice = quwRows.Min(r => r.UnCtrd.MinPrice);
-            var maxPrice = quwRows.Max(r => r.Ungeb.MaxPrice);
+            var maxPrice = quwRows.Max(r => r.UnCtrd.MaxPrice);
-            var gebRows = data.Rows
+            var ctrdRows = data.Rows
-                       .Where(r => r.Geb.MaxPrice != null && r.Ungeb.MinPrice != null)
+                       .Where(r => r.Ctrd.MaxPrice != null && r.UnCtrd.MinPrice != null)
-                       .Select(r => r.Geb.MaxPrice - r.Ungeb.MinPrice);
+                       .Select(r => r.Ctrd.MaxPrice - r.UnCtrd.MinPrice);
-            var minGeb = gebRows.Min();
+            var minCtrd = ctrdRows.Min();
-            var maxGeb = gebRows.Max();
+            var maxCtrd = ctrdRows.Max();
 
             tbl.AddCell(NewSectionHdr("Allgemein", colspan: 5))
                 .AddCell(NewSectionHdr("Berücksichtigt", colspan: 3, borderLeft: true))
@@ -197,7 +197,7 @@ namespace Elwig.Documents {
                 .AddCell(NewTd(CurrencySymbol))
                 .AddCell(NewTd($"{Math.Abs(vat):N2}", right: true))
                 .AddCell(NewSectionTh("Gebunden-Zuschlag:", borderLeft: 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(NewTd(minCtrd == null && maxCtrd == null ? "-" : minCtrd != maxCtrd ? $"{minCtrd:N4}\u2013{maxCtrd:N4} {CurrencySymbol}/kg" : minCtrd == 0 ? "-" : $"{minCtrd:N4} {CurrencySymbol}/kg", colspan: 2, center: true))
 
                 .AddCell(NewSectionTh("Bruttosumme:", colspan: 2))
                 .AddCell(NewTd(borderTop: true))
@@ -211,21 +211,21 @@ namespace Elwig.Documents {
                 .AddCell(NewTd(CurrencySymbol))
                 .AddCell(NewTd($"{Math.Abs(totalMods):N2}", right: true))
                 .AddCell(NewSectionTh("Menge (ungebunden):", borderLeft: true, borderTop: true))
-                .AddCell(NewTd($"{data.Rows.Sum(r => r.Ungeb.Weight):N0} kg", colspan: 2, right: true, borderTop: true))
+                .AddCell(NewTd($"{data.Rows.Sum(r => r.UnCtrd.Weight):N0} kg", colspan: 2, right: true, borderTop: true))
 
                 .AddCell(NewSectionTh("Bereits berücksichtigte Abzüge:", colspan: 2))
                 .AddCell(NewTd(Utils.GetSign(considered)))
                 .AddCell(NewTd(CurrencySymbol))
                 .AddCell(NewTd($"{Math.Abs(considered):N2}", right: true))
                 .AddCell(NewSectionTh("Menge (gebunden):", borderLeft: true))
-                .AddCell(NewTd($"{data.Rows.Sum(r => r.Geb.Weight + r.LowGeb.Weight):N0} kg", colspan: 2, right: true))
+                .AddCell(NewTd($"{data.Rows.Sum(r => r.Ctrd.Weight + r.LowCtrd.Weight):N0} kg", colspan: 2, right: true))
 
                 .AddCell(NewSectionTh("Auszahlungsbetrag:", colspan: 2))
                 .AddCell(NewTd(borderTop: true))
                 .AddCell(NewTd(CurrencySymbol, borderTop: true))
                 .AddCell(NewTd($"{totalSum:N2}", right: true, borderTop: true))
                 .AddCell(NewSectionTh("Gesamtmenge:", borderLeft: true))
-                .AddCell(NewTd($"{data.Rows.Sum(r => r.Ungeb.Weight + r.LowGeb.Weight + r.Geb.Weight):N0} kg", colspan: 2, right: true, borderTop: true));
+                .AddCell(NewTd($"{data.Rows.Sum(r => r.UnCtrd.Weight + r.LowCtrd.Weight + r.Ctrd.Weight):N0} kg", colspan: 2, right: true, borderTop: true));
 
             return tbl;
         }
@@ -290,22 +290,22 @@ namespace Elwig.Documents {
                         .ToList();
                     var border = lastHdr != null;
                     tbl.AddCell(NewTd(hdr, colspan: 2, bold: true, italic: true, borderTop: border))
-                        .AddCell(NewTd($"{rows.Sum(r => r.Ungeb.Weight):N0}", right: true, bold: true, borderTop: border))
+                        .AddCell(NewTd($"{rows.Sum(r => r.UnCtrd.Weight):N0}", right: true, bold: true, borderTop: border))
                         .AddCell(NewTd(borderTop: border))
-                        .AddCell(NewTd($"{rows.Sum(r => r.LowGeb.Weight):N0}", right: true, bold: true, borderTop: border))
+                        .AddCell(NewTd($"{rows.Sum(r => r.LowCtrd.Weight):N0}", right: true, bold: true, borderTop: border))
                         .AddCell(NewTd(borderTop: border))
-                        .AddCell(NewTd($"{rows.Sum(r => r.Geb.Weight):N0}", right: true, bold: true, borderTop: border))
+                        .AddCell(NewTd($"{rows.Sum(r => r.Ctrd.Weight):N0}", right: true, bold: true, borderTop: border))
                         .AddCell(NewTd(borderTop: border))
                         .AddCell(NewTd($"{rows.Sum(r => r.Amount):N2}", right: true, bold: true, borderTop: border));
                 }
                 tbl.AddCell(NewTd(row.QualityLevel))
                     .AddCell(NewTd($"{row.Oe:N0}", center: true))
-                    .AddCell(NewTd(row.Ungeb.Weight != 0 ? $"{row.Ungeb.Weight:N0}" : "-", right: true))
+                    .AddCell(NewTd(row.UnCtrd.Weight != 0 ? $"{row.UnCtrd.Weight:N0}" : "-", right: true))
-                    .AddCell(NewTd(row.Ungeb.MaxPrice != null ? $"{row.Ungeb.MaxPrice:N4}" : "-", right: true))
+                    .AddCell(NewTd(row.UnCtrd.MaxPrice != null ? $"{row.UnCtrd.MaxPrice:N4}" : "-", right: true))
-                    .AddCell(NewTd(row.LowGeb.Weight != 0 ? $"{row.LowGeb.Weight:N0}" : "-", right: true))
+                    .AddCell(NewTd(row.LowCtrd.Weight != 0 ? $"{row.LowCtrd.Weight:N0}" : "-", right: true))
-                    .AddCell(NewTd(row.LowGeb.MaxPrice != null ? $"{row.LowGeb.MaxPrice:N4}" : "-", right: true))
+                    .AddCell(NewTd(row.LowCtrd.MaxPrice != null ? $"{row.LowCtrd.MaxPrice:N4}" : "-", right: true))
-                    .AddCell(NewTd(row.Geb.Weight != 0 ? $"{row.Geb.Weight:N0}" : "-", right: true))
+                    .AddCell(NewTd(row.Ctrd.Weight != 0 ? $"{row.Ctrd.Weight:N0}" : "-", right: true))
-                    .AddCell(NewTd(row.Geb.MaxPrice != null ? $"{row.Geb.MaxPrice:N4}" : "-", right: true))
+                    .AddCell(NewTd(row.Ctrd.MaxPrice != null ? $"{row.Ctrd.MaxPrice:N4}" : "-", right: true))
                     .AddCell(NewTd($"{row.Amount:N2}", right: true));
                 lastHdr = hdr;
             }

Elwig/Helpers/AppDbContext.cs

@@ -15,7 +15,7 @@ using System.Threading.Tasks;
 namespace Elwig.Helpers {
 
     public record struct MemberHistoryPoint(int Shares, int SharesRed, int SharesWhite, int SharesDormant);
-    public record struct AreaComBucket(int Area, int Obligation, int Right);
+    public record struct AreaCmtBucket(int Area, int Obligation, int Right);
     public record struct UnderDelivery(int Weight, int Diff);
     public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int DeliveryTotal, int Payment);
     public record struct MemberStat(string Variety, string Discr, int Weight);
@@ -43,14 +43,14 @@ namespace Elwig.Helpers {
         public DbSet<WineAttr> WineAttributes { get; private set; }
         public DbSet<WineCult> WineCultivations { get; private set; }
         public DbSet<Branch> Branches { get; private set; }
-        public DbSet<AreaComType> AreaCommitmentTypes { get; private set; }
+        public DbSet<AreaCmtType> AreaCommitmentTypes { get; private set; }
         public DbSet<Member> Members { get; private set; }
         public DbSet<BillingAddr> BillingAddresses { get; private set; }
         public DbSet<MemberTelNr> MemberTelephoneNrs { get; private set; }
         public DbSet<MemberEmailAddr> MemberEmailAddrs { get; private set; }
         public DbSet<MemberHistory> MemberHistory { get; private set; }
-        public DbSet<AreaComContract> AreaCommitmentContracts { get; private set; }
+        public DbSet<AreaCmtContract> AreaCommitmentContracts { get; private set; }
-        public DbSet<AreaCom> AreaCommitments { get; private set; }
+        public DbSet<AreaCmt> AreaCommitments { get; private set; }
         public DbSet<Season> Seasons { get; private set; }
         public DbSet<DeliverySchedule> DeliverySchedules { get; private set; }
         public DbSet<DeliveryScheduleWineVar> DeliveryScheduleWineVarieties { get; private set; }
@@ -67,10 +67,10 @@ namespace Elwig.Helpers {
         public DbSet<DeliveryPartBucket> DeliveryPartBuckets { get; private set; }
 
         public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
-        public DbSet<AreaComUnderDeliveryRowSingle> AreaComUnderDeliveryRows { get; private set; }
+        public DbSet<AreaCmtUnderDeliveryRowSingle> AreaCmtUnderDeliveryRows { get; private set; }
         public DbSet<MemberDeliveryPerVarietyRowSingle> MemberDeliveryPerVariantRows { get; private set; }
-        public DbSet<MemberAreaComTotalsRowSingle> MemberAreaComTotalsRows { get; private set; }
+        public DbSet<MemberAreaCmtTotalsRowSingle> MemberAreaCmtTotalsRows { get; private set; }
-        public DbSet<MemberAreaComsRow> MemberAreaComsRows { get; private set; }
+        public DbSet<MemberAreaCmtsRow> MemberAreaCmtsRows { get; private set; }
         public DbSet<CreditNoteDeliveryRowSingle> CreditNoteDeliveryRows { get; private set; }
         public DbSet<CreditNoteRowSingle> CreditNoteRows { get; private set; }
         public DbSet<WeightBreakdownRow> WeightBreakDownRows { get; private set; }
@@ -132,8 +132,8 @@ namespace Elwig.Helpers {
                 .OrderBy(m => m.Name).ThenBy(m => m.GivenName).ThenBy(m => m.MgNr)
                 .AsSplitQuery());
 
-        private static readonly Func<AppDbContext, int?, IAsyncEnumerable<AreaCom>> _compiledQueryAreaCommitments =
+        private static readonly Func<AppDbContext, int?, IAsyncEnumerable<AreaCmt>> _compiledQueryAreaCommitments =
-            EF.CompileAsyncQuery<AppDbContext, int?, AreaCom>((ctx, fbnr) => ctx.AreaCommitments
+            EF.CompileAsyncQuery<AppDbContext, int?, AreaCmt>((ctx, fbnr) => ctx.AreaCommitments
                 .Where(c => fbnr == null || c.FbNr == fbnr)
                 .OrderBy(c => c.FbNr).ThenBy(c => c.RevNr));
 
@@ -149,7 +149,7 @@ namespace Elwig.Helpers {
                 .OrderByDescending(s => s.Year));
 
         private readonly Dictionary<int, Dictionary<int, MemberHistoryPoint>> _memberHistory = [];
-        private readonly Dictionary<int, Dictionary<int, Dictionary<string, AreaComBucket>>> _memberAreaCommitmentBuckets = [];
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, AreaCmtBucket>>> _memberAreaCommitmentBuckets = [];
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = [];
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBucketsStrict = [];
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberPaymentBuckets = [];
@@ -229,13 +229,13 @@ namespace Elwig.Helpers {
             modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Kg).AutoInclude();
             modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Rd).AutoInclude();
             modelBuilder.Entity<DeliveryPartModifier>().Navigation(m => m.Modifier).AutoInclude();
-            modelBuilder.Entity<AreaComContract>().Navigation(c => c.Kg).AutoInclude();
+            modelBuilder.Entity<AreaCmtContract>().Navigation(c => c.Kg).AutoInclude();
-            modelBuilder.Entity<AreaComContract>().Navigation(c => c.Rd).AutoInclude();
+            modelBuilder.Entity<AreaCmtContract>().Navigation(c => c.Rd).AutoInclude();
-            modelBuilder.Entity<AreaCom>().Navigation(c => c.Contract).AutoInclude();
+            modelBuilder.Entity<AreaCmt>().Navigation(c => c.Contract).AutoInclude();
-            modelBuilder.Entity<AreaCom>().Navigation(c => c.WineCult).AutoInclude();
+            modelBuilder.Entity<AreaCmt>().Navigation(c => c.WineCult).AutoInclude();
-            modelBuilder.Entity<AreaCom>().Navigation(c => c.AreaComType).AutoInclude();
+            modelBuilder.Entity<AreaCmt>().Navigation(c => c.AreaCmtType).AutoInclude();
-            modelBuilder.Entity<AreaComType>().Navigation(c => c.WineVar).AutoInclude();
+            modelBuilder.Entity<AreaCmtType>().Navigation(c => c.WineVar).AutoInclude();
-            modelBuilder.Entity<AreaComType>().Navigation(c => c.WineAttr).AutoInclude();
+            modelBuilder.Entity<AreaCmtType>().Navigation(c => c.WineAttr).AutoInclude();
             modelBuilder.Entity<PaymentMember>().Navigation(c => c.Credit).AutoInclude();
             modelBuilder.Entity<PaymentMember>().Navigation(c => c.Member).AutoInclude();
             modelBuilder.Entity<PaymentMember>().Navigation(c => c.Variant).AutoInclude();
@@ -438,7 +438,7 @@ namespace Elwig.Helpers {
         private async Task FetchMemberAreaCommitmentBuckets(int year, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
-            var buckets = new Dictionary<int, Dictionary<string, AreaComBucket>>();
+            var buckets = new Dictionary<int, Dictionary<string, AreaCmtBucket>>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"SELECT mgnr, bucket, area, min_kg, max_kg FROM v_area_commitment_bucket WHERE year = {year}";
                 using var reader = await cmd.ExecuteReaderAsync();
@@ -531,7 +531,7 @@ namespace Elwig.Helpers {
             return _memberHistory[year].GetValueOrDefault(mgnr, new());
         }
 
-        public async Task<Dictionary<string, AreaComBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
+        public async Task<Dictionary<string, AreaCmtBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
             if (!_memberAreaCommitmentBuckets.ContainsKey(year))
                 await FetchMemberAreaCommitmentBuckets(year, cnx);
             return _memberAreaCommitmentBuckets[year].GetValueOrDefault(mgnr, []);

Elwig/Helpers/Billing/Billing.cs

@@ -13,32 +13,32 @@ namespace Elwig.Helpers.Billing {
         protected readonly Season Season;
         protected readonly Dictionary<string, string> Attributes;
         protected readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
-        protected readonly Dictionary<string, (string, string?, string?, int?, decimal?)> AreaComTypes;
+        protected readonly Dictionary<string, (string, string?, string?, int?, decimal?)> AreaCmtTypes;
 
         protected Billing(int year, Season season,
             Dictionary<string, string> attributes,
             Dictionary<string, (decimal?, decimal?)> modifiers,
-            Dictionary<string, (string, string?, string?, int?, decimal?)> areaComTypes
+            Dictionary<string, (string, string?, string?, int?, decimal?)> areaCmtTypes
         ) {
             Year = year;
             Season = season;
             Attributes = attributes;
             Modifiers = modifiers;
-            AreaComTypes = areaComTypes;
+            AreaCmtTypes = areaCmtTypes;
         }
 
         protected static async Task<(Season, Dictionary<string, string>, Dictionary<string, (decimal?, decimal?)>, Dictionary<string, (string, string?, string?, int?, decimal?)>)> LoadData(AppDbContext ctx, int year) {
             var season = await ctx.FetchSeasons(year).SingleOrDefaultAsync() ?? throw new ArgumentException("Invalid season");
             var attributes = await ctx.FetchWineAttributes().ToDictionaryAsync(a => a.AttrId, a => a.Name);
             var modifiers = await ctx.FetchModifiers(year).ToDictionaryAsync(m => m.ModId, m => (m.Abs, m.Rel));
-            var areaComTypes = ctx.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId, v.Discriminator, v.MinKgPerHa, v.PenaltyAmount));
+            var areaCmtTypes = ctx.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId, v.Discriminator, v.MinKgPerHa, v.PenaltyAmount));
-            return (season, attributes, modifiers, areaComTypes);
+            return (season, attributes, modifiers, areaCmtTypes);
         }
 
         public static async Task<Billing> Create(int year) {
             using var ctx = new AppDbContext();
-            var (season, attributes, modifiers, areaComTypes) = await LoadData(ctx, year);
+            var (season, attributes, modifiers, areaCmtTypes) = await LoadData(ctx, year);
-            return new Billing(year, season, attributes, modifiers, areaComTypes);
+            return new Billing(year, season, attributes, modifiers, areaCmtTypes);
         }
 
         public async Task FinishSeason() {
@@ -77,13 +77,13 @@ namespace Elwig.Helpers.Billing {
         }
 
         public async Task CalculateBuckets(
-            bool? honorGebundenField = null,
+            bool? honorContractedField = null,
             bool? allowAttributesIntoLower = null,
             bool? avoidUnderDeliveries = null,
             SqliteConnection? cnx = null
          ) {
             using var ctx = new AppDbContext();
-            var honorGebunden = honorGebundenField ?? Season.Billing_HonorGebunden;
+            var honorContracted = honorContractedField ?? Season.Billing_HonorContracted;
             var allowAttrsIntoLower = allowAttributesIntoLower ?? Season.Billing_AllowAttrsIntoLower;
             var avoidUnderDlvrs = avoidUnderDeliveries ?? Season.Billing_AvoidUnderDeliveries;
             var attrVals = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => (a.IsStrict, a.FillLower));
@@ -96,10 +96,10 @@ namespace Elwig.Helpers.Billing {
             var deliveries = new List<(int, int, int, string, int, double, string, string?, string[], bool?)>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
-                    SELECT mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, gebunden
+                    SELECT mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, contracted
                     FROM v_delivery
                     WHERE year = {Year}
-                    ORDER BY mgnr, sortid, abgewertet ASC, {(honorGebunden ? "gebunden IS NOT NULL DESC, gebunden DESC," : "")}
+                    ORDER BY mgnr, sortid, abgewertet ASC, {(honorContracted ? "contracted IS NOT NULL DESC, contracted DESC," : "")}
                              attribute_prio DESC, COALESCE(attrid, '~'), kmw DESC, lsnr, dpnr
                     """;
                 using var reader = await cmd.ExecuteReaderAsync();
@@ -115,14 +115,14 @@ namespace Elwig.Helpers.Billing {
             }
 
             int lastMgNr = 0;
-            Dictionary<string, AreaComBucket>? rightsAndObligations = null;
+            Dictionary<string, AreaCmtBucket>? rightsAndObligations = null;
             Dictionary<string, int> used = [];
-            foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, gebunden) in deliveries) {
+            foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, contracted) in deliveries) {
                 if (lastMgNr != mgnr) {
                     rightsAndObligations = await ctx.GetMemberAreaCommitmentBuckets(Year, mgnr);
                     used = [];
                 }
-                if ((honorGebunden && gebunden == false) ||
+                if ((honorContracted && contracted == false) ||
                     rightsAndObligations == null || rightsAndObligations.Count == 0 ||
                     qualid == "WEI" || qualid == "RSW" || qualid == "LDW")
                 {
@@ -140,7 +140,7 @@ namespace Elwig.Helpers.Billing {
                 foreach (var p in Utils.Permutate(attributes, attributes.Intersect(attrForced))) {
                     var c = p.Count();
                     var key = sortid + string.Join("", p);
-                    if (rightsAndObligations.TryGetValue(key, out AreaComBucket value)) {
+                    if (rightsAndObligations.TryGetValue(key, out AreaCmtBucket value)) {
                         int i = (c == 0) ? 1 : 2;
                         var u = used.GetValueOrDefault(key, 0);
                         var vr = Math.Max(0, Math.Min(value.Right - u, w));

Elwig/Helpers/Billing/BillingData.cs

@@ -14,7 +14,7 @@ namespace Elwig.Helpers.Billing {
 
         public enum CalculationMode { Elwig, WgMaster }
         public enum CurveMode { Oe, Kmw }
-        public record struct Curve(CurveMode Mode, Dictionary<double, decimal> Normal, Dictionary<double, decimal>? Gebunden);
+        public record struct Curve(CurveMode Mode, Dictionary<double, decimal> Normal, Dictionary<double, decimal>? Contracted);
 
         public static JsonSchema? Schema { get; private set; }
 
@@ -179,10 +179,10 @@ namespace Elwig.Helpers.Billing {
                 } else {
                     throw new InvalidOperationException();
                 }
-                var geb = obj["geb"];
+                var ctrd = obj["contracted"] ?? obj["geb"];
-                if (geb is JsonObject) {
+                if (ctrd is JsonObject) {
-                    c2 = GetCurveData(geb.AsObject(), cMode);
+                    c2 = GetCurveData(ctrd.AsObject(), cMode);
-                } else if (geb?.AsValue().TryGetValue(out decimal v) == true) {
+                } else if (ctrd?.AsValue().TryGetValue(out decimal v) == true) {
                     var splitVal = GetCurveValueAt(c1, quw);
                     c2 = c1.ToDictionary(e => e.Key, e => e.Value + (e.Key >= quw ? v : 0));
                     c2[quw] = splitVal + v;
@@ -274,7 +274,7 @@ namespace Elwig.Helpers.Billing {
 
         protected static JsonNode GraphEntryToJson(GraphEntry entry) {
             try {
-                if (entry.GebundenFlatBonus == null) {
+                if (entry.ContractedFlatBonus == null) {
                     return JsonValue.Create((decimal)entry.DataGraph.DataY.Distinct().Single());
                 }
             } catch { }
@@ -286,10 +286,12 @@ namespace Elwig.Helpers.Billing {
 
             curve["data"] = GraphToJson(entry.DataGraph, entry.Mode.ToString().ToLower());
 
-            if (entry.GebundenFlatBonus != null) {
+            if (entry.ContractedFlatBonus != null) {
-                curve["geb"] = (decimal)entry.GebundenFlatBonus;
+                curve["contracted"] = (decimal)entry.ContractedFlatBonus;
-            } else if (entry.GebundenGraph != null) {
+                curve.Remove("geb");
-                curve["geb"] = GraphToJson(entry.GebundenGraph, entry.Mode.ToString().ToLower());
+            } else if (entry.ContractedGraph != null) {
+                curve["contracted"] = GraphToJson(entry.ContractedGraph, entry.Mode.ToString().ToLower());
+                curve.Remove("geb");
             }
 
             return curve;

Elwig/Helpers/Billing/BillingVariant.cs

@@ -16,9 +16,9 @@ namespace Elwig.Helpers.Billing {
         protected BillingVariant(int year, int avnr, Season season,
             Dictionary<string, string> attributes,
             Dictionary<string, (decimal?, decimal?)> modifiers,
-            Dictionary<string, (string, string?, string?, int?, decimal?)> areaComTypes,
+            Dictionary<string, (string, string?, string?, int?, decimal?)> areaCmtTypes,
             PaymentVar paymentVar, PaymentBillingData data) :
-            base(year, season, attributes, modifiers, areaComTypes) {
+            base(year, season, attributes, modifiers, areaCmtTypes) {
             AvNr = avnr;
             PaymentVariant = paymentVar;
             Data = data;
@@ -32,16 +32,16 @@ namespace Elwig.Helpers.Billing {
 
         public static async Task<BillingVariant> Create(int year, int avnr) {
             using var ctx = new AppDbContext();
-            var (season, attributes, modifiers, areaComTypes) = await LoadData(ctx, year);
+            var (season, attributes, modifiers, areaCmtTypes) = await LoadData(ctx, year);
             var (paymentVar, data) = await LoadData(ctx, year, avnr);
-            return new BillingVariant(year, avnr, season, attributes, modifiers, areaComTypes, paymentVar, data);
+            return new BillingVariant(year, avnr, season, attributes, modifiers, areaCmtTypes, paymentVar, data);
         }
 
-        public async Task Calculate(bool strictPrices = true, bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
+        public async Task Calculate(bool strictPrices = true, bool? honorContracted = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
             if (PaymentVariant == null || Data == null) throw new Exception("Call Load before Calculate");
             using var cnx = await AppDbContext.ConnectAsync();
             using var tx = await cnx.BeginTransactionAsync();
-            await CalculateBuckets(honorGebunden, allowAttrsIntoLower, avoidUnderDeliveries, cnx);
+            await CalculateBuckets(honorContracted, allowAttrsIntoLower, avoidUnderDeliveries, cnx);
             await DeleteInDb(cnx);
             await SetCalcTime(cnx);
             KeyNotFoundException? exception = null;
@@ -73,7 +73,7 @@ namespace Elwig.Helpers.Billing {
                            v.avnr,
                            ROUND(p.amount / POW(10, s.precision - 2)) AS net_amount,
                            IIF(lc.amount < 0, 0, ROUND(lp.amount / POW(10, s.precision - 2))) AS prev_net_amount,
-                           IIF(m.buchführend, s.vat_normal, s.vat_flatrate) AS vat,
+                           IIF(m.accounting, s.vat_normal, s.vat_flatrate) AS vat,
                            ROUND(IIF({Data.ConsiderTotalPenalty}, COALESCE(b.total_penalty, 0), 0) / POW(10, s.precision - 2)) +
                            ROUND(IIF({Data.ConsiderContractPenalties}, COALESCE(u.total_penalty, 0), 0) / POW(10, 4 - 2)) +
                            ROUND(IIF({Data.ConsiderAutoBusinessShares}, -COALESCE(a.total_amount, 0), 0)) +
@@ -170,7 +170,7 @@ namespace Elwig.Helpers.Billing {
 
         protected async Task CalculatePrices(SqliteConnection cnx, bool strict = true) {
             var invalid = new HashSet<string>();
-            var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string? AttrId, string? CultId, string Discr, int Value, double Oe, double Kmw, string QualId, bool AttrAreaCom)>();
+            var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string? AttrId, string? CultId, string Discr, int Value, double Oe, double Kmw, string QualId, bool AttrAreaCmt)>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
                     SELECT d.year, d.did, d.dpnr, b.bktnr, d.sortid, d.attrid, d.cultid, b.discr, b.value, d.oe, d.kmw, d.qualid, COALESCE(a.area_com, TRUE)
@@ -195,13 +195,13 @@ namespace Elwig.Helpers.Billing {
             foreach (var part in parts) {
                 if (part.Value == 0)
                     continue;
-                var ungeb = part.Discr == "_";
+                var unctrd = part.Discr == "_";
                 var payAttrId = (part.Discr is "" or "_") ? null : part.Discr;
-                var attrId = part.AttrAreaCom ? payAttrId : part.AttrId;
+                var attrId = part.AttrAreaCmt ? payAttrId : part.AttrId;
-                var geb = !ungeb && (payAttrId == attrId || !part.AttrAreaCom);
+                var ctrd = !unctrd && (payAttrId == attrId || !part.AttrAreaCmt);
                 decimal price = 0;
                 try {
-                    price = Data.CalculatePrice(part.SortId, attrId, part.CultId, part.QualId, geb, part.Oe, part.Kmw);
+                    price = Data.CalculatePrice(part.SortId, attrId, part.CultId, part.QualId, ctrd, part.Oe, part.Kmw);
                 } catch (KeyNotFoundException e) {
                     invalid.Add(e.Message.Split('\'')[1]);
                 }

Elwig/Helpers/Billing/GraphEntry.cs

@@ -7,7 +7,7 @@ namespace Elwig.Helpers.Billing {
     public class GraphEntry {
 
         public const int MinX = 50;
-        public const int MinXGeb = 73;
+        public const int MinXCtrd = 73;
         public const int MaxX = 120;
 
         public int Id { get; set; }
@@ -15,11 +15,11 @@ namespace Elwig.Helpers.Billing {
         public bool Abgewertet { get; set; }
 
         public Graph DataGraph { get; set; }
-        public Graph? GebundenGraph { get; set; }
+        public Graph? ContractedGraph { get; set; }
-        public double? GebundenFlatBonus {
+        public double? ContractedFlatBonus {
             get {
                 try {
-                    var val = GebundenGraph?.DataX.Zip(GebundenGraph.DataY)
+                    var val = ContractedGraph?.DataX.Zip(ContractedGraph.DataY)
                         .Select(e => Math.Round(e.Second - DataGraph.GetPriceAtOe(e.First), Precision))
                         .Distinct()
                         .Single();
@@ -30,10 +30,10 @@ namespace Elwig.Helpers.Billing {
             }
             set {
                 if (value is not double v) return;
-                var values = Enumerable.Range(MinXGeb, MaxX - MinXGeb + 1)
+                var values = Enumerable.Range(MinXCtrd, MaxX - MinXCtrd + 1)
                     .Select(i => Math.Round(DataGraph.GetPriceAtOe(i) + v, Precision))
                     .ToArray();
-                GebundenGraph = new Graph(values, Precision, MinXGeb, MaxX);
+                ContractedGraph = new Graph(values, Precision, MinXCtrd, MaxX);
             }
         }
 
@@ -52,39 +52,39 @@ namespace Elwig.Helpers.Billing {
             Vaributes = [];
         }
 
-        public GraphEntry(int id, int precision, BillingData.CurveMode mode, Dictionary<double, decimal> data, Dictionary<double, decimal>? gebunden) :
+        public GraphEntry(int id, int precision, BillingData.CurveMode mode, Dictionary<double, decimal> data, Dictionary<double, decimal>? contracted) :
             this(id, precision, mode) {
             DataGraph = new Graph(data, precision, MinX, MaxX);
-            if (gebunden != null) GebundenGraph = new Graph(gebunden, precision, MinXGeb, MaxX);
+            if (contracted != null) ContractedGraph = new Graph(contracted, precision, MinXCtrd, MaxX);
         }
 
         public GraphEntry(int id, int precision, BillingData.Curve curve, List<Varibute> vaributes) :
             this(id, precision, curve.Mode) {
             DataGraph = new Graph(curve.Normal, precision, MinX, MaxX);
-            if (curve.Gebunden != null)
+            if (curve.Contracted != null)
-                GebundenGraph = new Graph(curve.Gebunden, precision, MinXGeb, MaxX);
+                ContractedGraph = new Graph(curve.Contracted, precision, MinXCtrd, MaxX);
             Vaributes = vaributes;
         }
 
-        private GraphEntry(int id, int precision, BillingData.CurveMode mode, Graph dataGraph, Graph? gebundenGraph, List<Varibute> vaributes) {
+        private GraphEntry(int id, int precision, BillingData.CurveMode mode, Graph dataGraph, Graph? contractedGraph, List<Varibute> vaributes) {
             Id = id;
             Precision = precision;
             Mode = mode;
             DataGraph = dataGraph;
-            GebundenGraph = gebundenGraph;
+            ContractedGraph = contractedGraph;
             Vaributes = vaributes;
         }
 
-        public void AddGebundenGraph() {
+        public void AddContractedGraph() {
-            GebundenGraph ??= new Graph(Precision, MinXGeb, MaxX);
+            ContractedGraph ??= new Graph(Precision, MinXCtrd, MaxX);
         }
 
-        public void RemoveGebundenGraph() {
+        public void RemoveContractedGraph() {
-            GebundenGraph = null;
+            ContractedGraph = null;
         }
 
         public GraphEntry Copy(int id) {
-            return new GraphEntry(id, Precision, Mode, (Graph)DataGraph.Clone(), (Graph?)GebundenGraph?.Clone(), []);
+            return new GraphEntry(id, Precision, Mode, (Graph)DataGraph.Clone(), (Graph?)ContractedGraph?.Clone(), []);
         }
     }
 }

Elwig/Helpers/Billing/PaymentBillingData.cs

@@ -45,9 +45,9 @@ namespace Elwig.Helpers.Billing {
             return dict;
         }
 
-        public decimal CalculatePrice(string sortid, string? attrid, string? cultid, string qualid, bool gebunden, double oe, double kmw) {
+        public decimal CalculatePrice(string sortid, string? attrid, string? cultid, string qualid, bool contracted, double oe, double kmw) {
             var curve = GetQualityCurve(qualid, sortid, attrid, cultid) ?? GetCurve(sortid, attrid, cultid);
-            return GetCurveValueAt((gebunden ? curve.Gebunden : null) ?? curve.Normal, curve.Mode == CurveMode.Oe ? oe : kmw);
+            return GetCurveValueAt((contracted ? curve.Contracted : null) ?? curve.Normal, curve.Mode == CurveMode.Oe ? oe : kmw);
         }
 
         private Curve LookupCurve(JsonValue val) {

Elwig/Helpers/Export/ElwigData.cs

@@ -63,8 +63,8 @@ namespace Elwig.Helpers.Export {
                     List<MemberTelNr> TelephoneNumbers,
                     List<MemberEmailAddr> EmailAddresses,
                     List<MemberHistory> MemberHistory,
-                    List<AreaCom> AreaCommitments,
+                    List<AreaCmt> AreaCommitments,
-                    List<AreaComContract> Contracts,
+                    List<AreaCmtContract> Contracts,
                     List<WbRd> Riede,
                     List<WbKg> WbKgs,
                     List<WbGl> WbGls,
@@ -75,7 +75,7 @@ namespace Elwig.Helpers.Export {
 
                 var metaData = new List<(string FileName, string ZwstId, string Device,
                     int? MemberNum, string? MemberFilters,
-                    int? AreaComNum, string? AreaComFilters,
+                    int? AreaCmtNum, string? AreaCmtFilters,
                     int? DeliveryNum, string? DeliveryFilters)>();
 
                 foreach (var filename in filenames) {
@@ -105,14 +105,14 @@ namespace Elwig.Helpers.Export {
                         var meta = await JsonNode.ParseAsync(metaJson!.Open());
                         var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>();
                         var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                        var areaComCount = meta!["area_commitment_contracts"]?["count"]?.AsValue().GetValue<int>();
+                        var areaCmtCount = meta!["area_commitment_contracts"]?["count"]?.AsValue().GetValue<int>();
-                        var areaComFilters = meta!["area_commitment_contracts"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                        var areaCmtFilters = meta!["area_commitment_contracts"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
                         var deliveryCount = meta!["deliveries"]?["count"]?.AsValue().GetValue<int>();
                         var deliveryFilters = meta!["deliveries"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
                         metaData.Add((Path.GetFileName(filename),
                             meta["zwstid"]!.AsValue().GetValue<string>(), meta["device"]!.AsValue().GetValue<string>(),
                             memberCount, memberFilters != null ? string.Join(" / ", memberFilters) : null,
-                            areaComCount, areaComFilters != null ? string.Join(" / ", areaComFilters) : null,
+                            areaCmtCount, areaCmtFilters != null ? string.Join(" / ", areaCmtFilters) : null,
                             deliveryCount, deliveryFilters != null ? string.Join(" / ", deliveryFilters) : null));
 
                         var wbKgsJson = zip.GetEntry("wb_kgs.json");
@@ -159,21 +159,21 @@ namespace Elwig.Helpers.Export {
                         }
 
                         // legacy area commitments
-                        var areaComsJson = zip.GetEntry("area_commitments.json");
+                        var areaCmtsJson = zip.GetEntry("area_commitments.json");
-                        if (areaComsJson != null) {
+                        if (areaCmtsJson != null) {
-                            using var reader = new StreamReader(areaComsJson.Open(), Utils.UTF8);
+                            using var reader = new StreamReader(areaCmtsJson.Open(), Utils.UTF8);
                             string? line;
                             while ((line = await reader.ReadLineAsync()) != null) {
                                 var obj = JsonNode.Parse(line)!.AsObject();
-                                var (contract, areaCom, wbrd, timestamps) = obj.ToAreaCom(kgs, currentWbKgs, currentWbRde);
+                                var (contract, areaCmt, wbrd, timestamps) = obj.ToAreaCmt(kgs, currentWbKgs, currentWbRde);
                                 r.Contracts.Add(contract);
-                                r.AreaCommitments.Add(areaCom);
+                                r.AreaCommitments.Add(areaCmt);
                                 if (wbrd != null) {
                                     r.Riede.Add(wbrd);
                                 }
                                 if (timestamps.HasValue) {
                                     r.Timestamps["area_commitment_contract"].Add((contract.FbNr, 0, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
-                                    r.Timestamps["area_commitment"].Add((areaCom.FbNr, areaCom.RevNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                                    r.Timestamps["area_commitment"].Add((areaCmt.FbNr, areaCmt.RevNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
                                 }
                             }
                         }
@@ -184,17 +184,17 @@ namespace Elwig.Helpers.Export {
                             string? line;
                             while ((line = await reader.ReadLineAsync()) != null) {
                                 var obj = JsonNode.Parse(line)!.AsObject();
-                                var (contract, areaComs, wbrd, timestamps) = obj.ToAreaComContract(kgs, currentWbKgs, currentWbRde);
+                                var (contract, areaCmts, wbrd, timestamps) = obj.ToAreaCmtContract(kgs, currentWbKgs, currentWbRde);
                                 r.Contracts.Add(contract);
-                                r.AreaCommitments.AddRange(areaComs.Select(v => v.Item1));
+                                r.AreaCommitments.AddRange(areaCmts.Select(v => v.Item1));
                                 if (wbrd != null) {
                                     r.Riede.Add(wbrd);
                                 }
                                 if (timestamps.HasValue)
                                     r.Timestamps["area_commitment_contract"].Add((contract.FbNr, 0, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
-                                foreach (var (areaCom, ts) in areaComs) {
+                                foreach (var (areaCmt, ts) in areaCmts) {
                                     if (!ts.HasValue) continue;
-                                    r.Timestamps["area_commitment"].Add((areaCom.FbNr, areaCom.RevNr, 0, ts.Value.CreatedAt, ts.Value.ModifiedAt));
+                                    r.Timestamps["area_commitment"].Add((areaCmt.FbNr, areaCmt.RevNr, 0, ts.Value.CreatedAt, ts.Value.ModifiedAt));
                                 }
                             }
                         }
@@ -235,7 +235,7 @@ namespace Elwig.Helpers.Export {
                 }
 
                 var importedMembers = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
-                var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
+                var importedAreaCmts = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
                 var importedDeliveries = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
 
                 foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, history, areaCommitments, contracts, riede, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
@@ -365,7 +365,7 @@ namespace Elwig.Helpers.Export {
                         ctx.AddRange(riede);
                         var n = importNewContracts ? contracts.Count - duplicateFbNrs.Count : 0;
                         var o = importDuplicateContracts ? duplicateFbNrs.Count : 0;
-                        importedAreaComs.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, contracts.Count - n - o, meta.AreaComFilters));
+                        importedAreaCmts.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, contracts.Count - n - o, meta.AreaCmtFilters));
                     }
 
                     if (allowedDuplicateLsNrs.Count > 0) {
@@ -447,8 +447,8 @@ namespace Elwig.Helpers.Export {
                             $"    ({d.New} neu, {d.Overwritten} überschrieben, {d.NotImported} nicht importiert)\n" +
                             $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
                             $"    Filter: {d.Filters}"),
-                        $"Flächenbindungen: {importedAreaComs.Sum(d => d.New + d.Overwritten)}",
+                        $"Flächenbindungen: {importedAreaCmts.Sum(d => d.New + d.Overwritten)}",
-                        ..importedAreaComs.Select(d =>
+                        ..importedAreaCmts.Select(d =>
                             $"  {d.FileName} ({d.New + d.Overwritten})\n" +
                             $"    ({d.New} importiert, {d.Overwritten} überschreiben, {d.NotImported} nicht importiert)\n" +
                             $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
@@ -481,11 +481,11 @@ namespace Elwig.Helpers.Export {
             }.Export(filename);
         }
 
-        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<MemberHistory> history, IEnumerable<AreaComContract> areaComs, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<MemberHistory> history, IEnumerable<AreaCmtContract> areaCmts, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
             return new ElwigExport {
                 Members = (members, filters),
                 History = (history, ["von exportierten Mitgliedern"]),
-                AreaComs = (areaComs, ["von exportierten Mitgliedern"]),
+                AreaCmts = (areaCmts, ["von exportierten Mitgliedern"]),
                 WbKgs = (wbKgs, ["von exportierten Mitgliedern und Flächenbindungen"]),
             }.Export(filename);
         }
@@ -501,7 +501,7 @@ namespace Elwig.Helpers.Export {
             public (IEnumerable<WbKg> WbKgs, IEnumerable<string> Filters)? WbKgs { get; set; }
             public (IEnumerable<Member> Members, IEnumerable<string> Filters)? Members { get; set; }
             public (IEnumerable<MemberHistory> History, IEnumerable<string> Filters)? History { get; set; }
-            public (IEnumerable<AreaComContract> AreaComs, IEnumerable<string> Filters)? AreaComs { get; set; }
+            public (IEnumerable<AreaCmtContract> AreaCmts, IEnumerable<string> Filters)? AreaCmts { get; set; }
             public (IEnumerable<Delivery> Deliveries, IEnumerable<string> Filters)? Deliveries { get; set; }
 
             public async Task Export(string filename) {
@@ -535,11 +535,11 @@ namespace Elwig.Helpers.Export {
                             ["count"] = History.Value.History.Count(),
                             ["filters"] = new JsonArray(History.Value.Filters.Select(f => (JsonNode)f).ToArray()),
                         };
-                    if (AreaComs != null)
+                    if (AreaCmts != null)
                         obj["area_commitment_contracts"] = new JsonObject {
-                            ["count"] = AreaComs.Value.AreaComs.Count(),
+                            ["count"] = AreaCmts.Value.AreaCmts.Count(),
-                            ["revisions"] = AreaComs.Value.AreaComs.Sum(c => c.Revisions.Count),
+                            ["revisions"] = AreaCmts.Value.AreaCmts.Sum(c => c.Revisions.Count),
-                            ["filters"] = new JsonArray(AreaComs.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                            ["filters"] = new JsonArray(AreaCmts.Value.Filters.Select(f => (JsonNode)f).ToArray()),
                         };
                     if (Deliveries != null)
                         obj["deliveries"] = new JsonObject {
@@ -572,10 +572,10 @@ namespace Elwig.Helpers.Export {
                         await writer.WriteLineAsync(h.ToJson().ToJsonString(Utils.JsonOpts));
                     }
                 }
-                if (AreaComs != null) {
+                if (AreaCmts != null) {
                     var json = zip.CreateEntry("area_commitment_contracts.json", CompressionLevel.SmallestSize);
                     using var writer = new StreamWriter(json.Open(), Utils.UTF8);
-                    foreach (var c in AreaComs.Value.AreaComs) {
+                    foreach (var c in AreaCmts.Value.AreaCmts) {
                         await writer.WriteLineAsync(c.ToJson().ToJsonString(Utils.JsonOpts));
                     }
                 }
@@ -641,10 +641,10 @@ namespace Elwig.Helpers.Export {
                 ["ooc_id"] = m.OrganicOperatorId,
                 ["org_auth_code"] = m.OrganicAuthorityCode,
                 ["juridical_pers"] = m.IsJuridicalPerson,
-                ["volllieferant"] = m.IsVollLieferant,
+                ["full_delivery"] = m.IsFullDelivery,
-                ["buchführend"] = m.IsBuchführend,
+                ["accounting"] = m.IsAccounting,
                 ["organic"] = m.IsOrganic,
-                ["funktionär"] = m.IsFunktionär,
+                ["officer"] = m.IsOfficer,
                 ["active"] = m.IsActive,
                 ["deceased"] = m.IsDeceased,
                 ["iban"] = m.Iban,
@@ -715,10 +715,10 @@ namespace Elwig.Helpers.Export {
                 OrganicOperatorId = json["ooc_id"]?.AsValue().GetValue<string>(),
                 OrganicAuthorityCode = json["org_auth_code"]?.AsValue().GetValue<string>(),
                 IsJuridicalPerson = json["juridical_pers"]?.AsValue().GetValue<bool>() ?? false,
-                IsVollLieferant = json["volllieferant"]?.AsValue().GetValue<bool>() ?? false,
+                IsFullDelivery = json["full_delivery"]?.AsValue().GetValue<bool>() ?? json["volllieferant"]?.AsValue().GetValue<bool>() ?? false,
-                IsBuchführend = json["buchführend"]?.AsValue().GetValue<bool>() ?? false,
+                IsAccounting = json["accounting"]?.AsValue().GetValue<bool>() ?? json["buchführend"]?.AsValue().GetValue<bool>() ?? false,
                 IsOrganic = json["organic"]?.AsValue().GetValue<bool>() ?? false,
-                IsFunktionär = json["funktionär"]?.AsValue().GetValue<bool>() ?? false,
+                IsOfficer = json["officer"]?.AsValue().GetValue<bool>() ?? json["funktionär"]?.AsValue().GetValue<bool>() ?? false,
                 IsActive = json["active"]?.AsValue().GetValue<bool>() ?? false,
                 IsDeceased = json["deceased"]?.AsValue().GetValue<bool>() ?? false,
                 Iban = json["iban"]?.AsValue().GetValue<string>(),
@@ -796,7 +796,7 @@ namespace Elwig.Helpers.Export {
             };
         }
 
-        public static JsonObject ToJson(this AreaComContract c) {
+        public static JsonObject ToJson(this AreaCmtContract c) {
             return new JsonObject {
                 ["fbnr"] = c.FbNr,
                 ["kgnr"] = c.KgNr,
@@ -808,7 +808,7 @@ namespace Elwig.Helpers.Export {
             };
         }
 
-        private static JsonObject ToJson(this AreaCom c) {
+        private static JsonObject ToJson(this AreaCmt c) {
             return new JsonObject {
                 ["revnr"] = c.RevNr,
                 ["mgnr"] = c.MgNr,
@@ -823,7 +823,7 @@ namespace Elwig.Helpers.Export {
             };
         }
 
-        public static (AreaComContract, List<(AreaCom, (DateTime CreatedAt, DateTime ModifiedAt)?)>, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaComContract(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, WbKg> currentWbKgs, Dictionary<int, List<WbRd>> riede) {
+        public static (AreaCmtContract, List<(AreaCmt, (DateTime CreatedAt, DateTime ModifiedAt)?)>, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCmtContract(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, WbKg> currentWbKgs, Dictionary<int, List<WbRd>> riede) {
             var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
             var ried = json["ried"]?.AsValue().GetValue<string>();
             var fbnr = json["fbnr"]!.AsValue()!.GetValue<int>();
@@ -848,16 +848,16 @@ namespace Elwig.Helpers.Export {
             }
             var createdAt = json["created_at"]?.AsValue().GetValue<string>();
             var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
-            return (new AreaComContract {
+            return (new AreaCmtContract {
                 FbNr = fbnr,
                 KgNr = kgnr,
                 RdNr = rd?.RdNr ?? json["rdnr"]?.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
                 ImportedAt = DateTime.Now,
-            }, [.. json["revisions"]!.AsArray().Select(r => r!.AsObject()).Select<JsonObject, (AreaCom, (DateTime, DateTime)?)>(r => {
+            }, [.. json["revisions"]!.AsArray().Select(r => r!.AsObject()).Select<JsonObject, (AreaCmt, (DateTime, DateTime)?)>(r => {
                 var createdAt = json["created_at"]?.AsValue().GetValue<string>();
                 var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
-                return (new AreaCom {
+                return (new AreaCmt {
                     FbNr = fbnr,
                     RevNr = r["revnr"]!.AsValue().GetValue<int>(),
                     MgNr = r["mgnr"]!.AsValue().GetValue<int>(),
@@ -877,7 +877,7 @@ namespace Elwig.Helpers.Export {
              DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
         }
 
-        public static (AreaComContract, AreaCom, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCom(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, WbKg> currentWbKgs, Dictionary<int, List<WbRd>> riede) {
+        public static (AreaCmtContract, AreaCmt, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCmt(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, WbKg> currentWbKgs, Dictionary<int, List<WbRd>> riede) {
             var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
             var ried = json["ried"]?.AsValue().GetValue<string>();
             if (!currentWbKgs.Values.Any(k => k.KgNr == kgnr)) {
@@ -901,13 +901,13 @@ namespace Elwig.Helpers.Export {
             }
             var createdAt = json["created_at"]?.AsValue().GetValue<string>();
             var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
-            return (new AreaComContract {
+            return (new AreaCmtContract {
                 FbNr = json["fbnr"]!.AsValue().GetValue<int>(),
                 KgNr = kgnr,
                 RdNr = rd?.RdNr ?? json["rdnr"]?.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
                 ImportedAt = DateTime.Now,
-            }, new AreaCom {
+            }, new AreaCmt {
                 FbNr = json["fbnr"]!.AsValue().GetValue<int>(),
                 RevNr = 1,
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
@@ -961,7 +961,7 @@ namespace Elwig.Helpers.Export {
             };
             if (p.IsSplCheck) obj["spl_check"] = p.IsSplCheck;
             if (p.IsHandPicked != null) obj["hand_picked"] = p.IsHandPicked;
-            if (p.IsGebunden != null) obj["gebunden"] = p.IsGebunden;
+            if (p.IsContracted != null) obj["contracted"] = p.IsContracted;
             if (p.Unloading != null) obj["unloading"] = p.Unloading;
             if (p.Temperature != null) obj["temperature"] = p.Temperature;
             if (p.Acid != null) obj["acid"] = p.Acid;
@@ -1035,7 +1035,7 @@ namespace Elwig.Helpers.Export {
                     Comment = p["comment"]?.AsValue().GetValue<string>(),
                     IsSplCheck = p["spl_check"]?.AsValue().GetValue<bool>() ?? false,
                     IsHandPicked = p["hand_picked"]?.AsValue().GetValue<bool>(),
-                    IsGebunden = p["gebunden"]?.AsValue().GetValue<bool>(),
+                    IsContracted = p["contracted"]?.AsValue().GetValue<bool>() ?? p["gebunden"]?.AsValue().GetValue<bool>(),
                     Unloading = p["unloading"]?.AsValue().GetValue<string>() ?? ((p["lesewagen"]?.AsValue().GetValue<bool>() ?? false) ? DeliveryPart.Pumped : null),
                     Temperature = p["temperature"]?.AsValue().GetValue<double>(),
                     Acid = p["acid"]?.AsValue().GetValue<double>(),

Elwig/Helpers/Utils.cs

@@ -662,16 +662,16 @@ namespace Elwig.Helpers {
             }
         }
 
-        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments() => ActiveAreaCommitments(CurrentYear);
+        public static Expression<Func<AreaCmt, bool>> ActiveAreaCommitments() => ActiveAreaCommitments(CurrentYear);
-        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments(int year) =>
+        public static Expression<Func<AreaCmt, bool>> ActiveAreaCommitments(int year) =>
             c => (c.YearFrom == null || c.YearFrom <= year) && (c.YearTo == null || c.YearTo >= year);
 
-        public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
+        public static IQueryable<AreaCmt> ActiveAreaCommitments(IQueryable<AreaCmt> query) => ActiveAreaCommitments(query, CurrentYear);
-        public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query, int year) =>
+        public static IQueryable<AreaCmt> ActiveAreaCommitments(IQueryable<AreaCmt> query, int year) =>
             query.Where(ActiveAreaCommitments(year));
 
-        public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
+        public static IEnumerable<AreaCmt> ActiveAreaCommitments(IEnumerable<AreaCmt> query) => ActiveAreaCommitments(query, CurrentYear);
-        public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query, int year) =>
+        public static IEnumerable<AreaCmt> ActiveAreaCommitments(IEnumerable<AreaCmt> query, int year) =>
             query.Where(c => ActiveAreaCommitments(year).Invoke(c));
 
         public static async Task<(DateTime DateTime, string Type, int MgNr, string Name, string[] Addresses, string Subject, string[] Attachments)[]> GetSentMails(DateOnly? fromDate = null, DateOnly? toDate = null) {

Elwig/Helpers/Validator.cs

@@ -577,7 +577,7 @@ namespace Elwig.Helpers {
             }
         }
 
-        public static ValidationResult CheckFbNr(TextBox input, bool required, AreaComContract? c) {
+        public static ValidationResult CheckFbNr(TextBox input, bool required, AreaCmtContract? c) {
             var res = CheckInteger(input, required);
             if (!res.IsValid) {
                 return res;

Elwig/Models/Dtos/AreaCmtUnderDeliveryData.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 
 namespace Elwig.Models.Dtos {
-    public class AreaComUnderDeliveryData : DataTable<AreaComUnderDeliveryRow> {
+    public class AreaCmtUnderDeliveryData : DataTable<AreaCmtUnderDeliveryRow> {
 
         private static readonly (string, string, string?, int)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
@@ -21,19 +21,19 @@ namespace Elwig.Models.Dtos {
             ("UnderDeliveries", "Unterliefert", "kg|%", 34),
         ];
 
-        public AreaComUnderDeliveryData(IEnumerable<AreaComUnderDeliveryRow> rows, int year) :
+        public AreaCmtUnderDeliveryData(IEnumerable<AreaCmtUnderDeliveryRow> rows, int year) :
             base($"Unterlieferungen FB", $"Unterlieferungen laut Flächenbindungen {year}", rows, FieldNames) {
         }
 
-        public static async Task<AreaComUnderDeliveryData> ForSeason(DbSet<AreaComUnderDeliveryRowSingle> table, int year) {
+        public static async Task<AreaCmtUnderDeliveryData> ForSeason(DbSet<AreaCmtUnderDeliveryRowSingle> table, int year) {
-            return new AreaComUnderDeliveryData(
+            return new AreaCmtUnderDeliveryData(
                 (await FromDbSet(table, year)).GroupBy(
                     r => r.MgNr,
-                    (k, g) => new AreaComUnderDeliveryRow(g)
+                    (k, g) => new AreaCmtUnderDeliveryRow(g)
               ), year);
         }
 
-        private static async Task<IEnumerable<AreaComUnderDeliveryRowSingle>> FromDbSet(DbSet<AreaComUnderDeliveryRowSingle> table, int year) {
+        private static async Task<IEnumerable<AreaCmtUnderDeliveryRowSingle>> FromDbSet(DbSet<AreaCmtUnderDeliveryRowSingle> table, int year) {
             return await table.FromSql($"""
                     SELECT m.mgnr, m.name AS name_1,
                            COALESCE(m.prefix || ' ', '') || m.given_name ||
@@ -51,7 +51,7 @@ namespace Elwig.Models.Dtos {
         }
     }
 
-    public class AreaComUnderDeliveryRow {
+    public class AreaCmtUnderDeliveryRow {
         public int MgNr;
         public string Name1;
         public string? Name2;
@@ -66,7 +66,7 @@ namespace Elwig.Models.Dtos {
             .Select(v => v.First < v.Second ? ((int?, double?))(v.First - v.Second, v.First * 100.0 / v.Second - 100.0) : (null, null))
             .ToArray();
 
-        public AreaComUnderDeliveryRow(IEnumerable<AreaComUnderDeliveryRowSingle> rows) {
+        public AreaCmtUnderDeliveryRow(IEnumerable<AreaCmtUnderDeliveryRowSingle> rows) {
             var f = rows.First();
             MgNr = f.MgNr;
             Name1 = f.Name1;
@@ -82,7 +82,7 @@ namespace Elwig.Models.Dtos {
     }
 
     [Keyless]
-    public class AreaComUnderDeliveryRowSingle {
+    public class AreaCmtUnderDeliveryRowSingle {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("name_1")]

Elwig/Models/Dtos/MemberAreaCmtTotalsData.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 
 namespace Elwig.Models.Dtos {
-    class MemberAreaComTotalsData : DataTable<MemberAreaComTotalsRow> {
+    class MemberAreaCmtTotalsData : DataTable<MemberAreaCmtTotalsRow> {
 
         private static readonly (string, string, string?, int)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
@@ -21,19 +21,19 @@ namespace Elwig.Models.Dtos {
             ("DeliveryRights", "Lieferrecht", "kg", 22),
         ];
 
-        public MemberAreaComTotalsData(IEnumerable<MemberAreaComTotalsRow> rows, int year) :
+        public MemberAreaCmtTotalsData(IEnumerable<MemberAreaCmtTotalsRow> rows, int year) :
             base($"Gebundene Fläche", $"Gebundene Fläche pro Mitglied {year}", rows, FieldNames) {
         }
 
-        public static async Task<MemberAreaComTotalsData> ForSeason(DbSet<MemberAreaComTotalsRowSingle> table, int year) {
+        public static async Task<MemberAreaCmtTotalsData> ForSeason(DbSet<MemberAreaCmtTotalsRowSingle> table, int year) {
-            return new MemberAreaComTotalsData(
+            return new MemberAreaCmtTotalsData(
                (await FromDbSet(table, year)).GroupBy(
                    r => r.MgNr,
-                   (k, g) => new MemberAreaComTotalsRow(g)
+                   (k, g) => new MemberAreaCmtTotalsRow(g)
              ), year);
         }
 
-        private static async Task<IEnumerable<MemberAreaComTotalsRowSingle>> FromDbSet(DbSet<MemberAreaComTotalsRowSingle> table, int year) {
+        private static async Task<IEnumerable<MemberAreaCmtTotalsRowSingle>> FromDbSet(DbSet<MemberAreaCmtTotalsRowSingle> table, int year) {
             return await table.FromSql($"""
                     SELECT m.mgnr, m.name AS name_1,
                            COALESCE(m.prefix || ' ', '') || m.given_name ||
@@ -50,7 +50,7 @@ namespace Elwig.Models.Dtos {
         }
     }
 
-    public class MemberAreaComTotalsRow {
+    public class MemberAreaCmtTotalsRow {
         public int MgNr;
         public string Name1;
         public string? Name2;
@@ -63,7 +63,7 @@ namespace Elwig.Models.Dtos {
         public int[] DeliveryObligations;
         public int[] DeliveryRights;
 
-        public MemberAreaComTotalsRow(IEnumerable<MemberAreaComTotalsRowSingle> rows) {
+        public MemberAreaCmtTotalsRow(IEnumerable<MemberAreaCmtTotalsRowSingle> rows) {
             var f = rows.First();
             MgNr = f.MgNr;
             Name1 = f.Name1;
@@ -80,7 +80,7 @@ namespace Elwig.Models.Dtos {
     }
 
     [Keyless]
-    public class MemberAreaComTotalsRowSingle {
+    public class MemberAreaCmtTotalsRowSingle {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("name_1")]

Elwig/Models/Dtos/MemberAreaCmtsData.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 
 namespace Elwig.Models.Dtos {
-    class MemberAreaComsData : DataTable<MemberAreaComsRow> {
+    class MemberAreaCmtsData : DataTable<MemberAreaCmtsRow> {
 
         private static readonly (string, string, string?, int)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
@@ -23,15 +23,15 @@ namespace Elwig.Models.Dtos {
             ("MaxKg", "Lieferrecht", "kg", 22),
         ];
 
-        public MemberAreaComsData(IEnumerable<MemberAreaComsRow> rows, int year) :
+        public MemberAreaCmtsData(IEnumerable<MemberAreaCmtsRow> rows, int year) :
             base($"Flächenbindungen", $"Flächenbindungen pro Mitglied {year}", rows, FieldNames) {
         }
 
-        public static async Task<MemberAreaComsData> ForSeason(DbSet<MemberAreaComsRow> table, int year) {
+        public static async Task<MemberAreaCmtsData> ForSeason(DbSet<MemberAreaCmtsRow> table, int year) {
-            return new MemberAreaComsData(await FromDbSet(table, year), year);
+            return new MemberAreaCmtsData(await FromDbSet(table, year), year);
         }
 
-        private static async Task<IEnumerable<MemberAreaComsRow>> FromDbSet(DbSet<MemberAreaComsRow> table, int year) {
+        private static async Task<IEnumerable<MemberAreaCmtsRow>> FromDbSet(DbSet<MemberAreaCmtsRow> table, int year) {
             return await table.FromSql($"""
                     SELECT m.mgnr, m.name AS name_1,
                            COALESCE(m.prefix || ' ', '') || m.given_name ||
@@ -56,7 +56,7 @@ namespace Elwig.Models.Dtos {
     }
 
     [Keyless]
-    public class MemberAreaComsRow {
+    public class MemberAreaCmtsRow {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("name_1")]

Elwig/Models/Dtos/MemberListData.cs

@@ -25,7 +25,7 @@ namespace Elwig.Models.Dtos {
             ("BillingPlz", "PLZ", null, 10),
             ("BillingLocality", "Ort", null, 60),
             ("LfbisNr", "Betr.-Nr.", null, 20),
-            ("IsBuchführend", "buchf.", null, 15),
+            ("IsAccounting", "buchf.", null, 15),
             ("IsOrganic", "Bio", null, 15),
             ("IsActive", "aktiv", null, 15),
             ("EntryDate", "Eintritt", null, 20),
@@ -46,15 +46,15 @@ namespace Elwig.Models.Dtos {
             base(MemberList.Name, MemberList.Name, string.Join(" / ", filterNames), rows, FieldNames) {
         }
 
-        public static async Task<MemberListData> FromQuery(IQueryable<Member> query, List<string> filterNames, IEnumerable<string> filterAreaCom) {
+        public static async Task<MemberListData> FromQuery(IQueryable<Member> query, List<string> filterNames, IEnumerable<string> filterAreaCmt) {
-            var areaComs = await query.Include(m => m.AreaCommitments).ToDictionaryAsync(m => m.MgNr, m => Utils.ActiveAreaCommitments(m.AreaCommitments));
+            var areaCmts = await query.Include(m => m.AreaCommitments).ToDictionaryAsync(m => m.MgNr, m => Utils.ActiveAreaCommitments(m.AreaCommitments));
             return new((await query
                 .Include(m => m.Branch)
                 .Include(m => m.TelephoneNumbers)
                 .Include(m => m.EmailAddresses)
                 .ToListAsync()).Select(m => new MemberListRow(m,
-                    areaComs[m.MgNr].Sum(c => c.Area),
+                    areaCmts[m.MgNr].Sum(c => c.Area),
-                    areaComs[m.MgNr].Where(c => filterAreaCom.Contains(c.VtrgId)).GroupBy(c => c.VtrgId).ToDictionary(g => g.Key, g => g.Sum(c => c.Area)))),
+                    areaCmts[m.MgNr].Where(c => filterAreaCmt.Contains(c.VtrgId)).GroupBy(c => c.VtrgId).ToDictionary(g => g.Key, g => g.Sum(c => c.Area)))),
                 filterNames);
         }
     }
@@ -83,7 +83,7 @@ namespace Elwig.Models.Dtos {
         public string? Bic;
         public int? AreaCommitment;
         public (string VtrgId, int Area)[] AreaCommitmentsFiltered;
-        public bool IsBuchführend;
+        public bool IsAccounting;
         public bool IsOrganic;
         public bool IsActive;
         public DateOnly? EntryDate;
@@ -94,7 +94,7 @@ namespace Elwig.Models.Dtos {
         public string? AdditionalContact;
         public string? Comment;
 
-        public MemberListRow(Member m, int? areaCom = null, Dictionary<string, int>? filtered = null) {
+        public MemberListRow(Member m, int? areaCmt = null, Dictionary<string, int>? filtered = null) {
             MgNr = m.MgNr;
             Name1 = m.Name;
             AdminName1 = m.AdministrativeName1;
@@ -118,7 +118,7 @@ namespace Elwig.Models.Dtos {
             UstIdNr = m.UstIdNr;
             Iban = m.Iban != null ? Utils.FormatIban(m.Iban) : null;
             Bic = m.Bic;
-            IsBuchführend = m.IsBuchführend;
+            IsAccounting = m.IsAccounting;
             IsOrganic = m.IsOrganic;
             IsActive = m.IsActive;
             EntryDate = m.EntryDate;
@@ -133,7 +133,7 @@ namespace Elwig.Models.Dtos {
                 .Distinct()
                 .Concat(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).Except([EmailAddress])));
             Comment = m.Comment;
-            AreaCommitment = areaCom == 0 ? null : areaCom;
+            AreaCommitment = areaCmt == 0 ? null : areaCmt;
             AreaCommitmentsFiltered = filtered != null ? filtered.OrderBy(f => f.Key).Select(f => (f.Key, f.Value)).ToArray() : [];
         }
     }

Elwig/Models/Dtos/PaymentVariantSummaryData.cs

@@ -18,9 +18,9 @@ namespace Elwig.Models.Dtos {
             ("Cultivation", "Bewirt.", null, 20),
             ("QualityLevel", "Qualitätsstufe", null, 30),
             ("Oe", "Gradation", "°Oe", 20),
-            ("Ungeb", "ungebunden", "kg|€/kg|€/kg", 60),
+            ("UnCtrd", "ungebunden", "kg|€/kg|€/kg", 60),
-            ("LowGeb", "attributlos gebunden", "kg|€/kg|€/kg", 60),
+            ("LowCtrd", "attributlos gebunden", "kg|€/kg|€/kg", 60),
-            ("Geb", "gebunden", "kg|€/kg|€/kg", 60),
+            ("Ctrd", "gebunden", "kg|€/kg|€/kg", 60),
             ("Amount", "Gesamt", "€", 25),
         ];
 
@@ -31,9 +31,9 @@ namespace Elwig.Models.Dtos {
             string? Cultivation,
             string QualityLevel,
             double Oe,
-            (int Weight, decimal? MinPrice, decimal? MaxPrice) Ungeb,
+            (int Weight, decimal? MinPrice, decimal? MaxPrice) UnCtrd,
-            (int Weight, decimal? MinPrice, decimal? MaxPrice) LowGeb,
+            (int Weight, decimal? MinPrice, decimal? MaxPrice) LowCtrd,
-            (int Weight, decimal? MinPrice, decimal? MaxPrice) Geb,
+            (int Weight, decimal? MinPrice, decimal? MaxPrice) Ctrd,
             decimal Amount
         );
 
@@ -44,9 +44,9 @@ namespace Elwig.Models.Dtos {
         public static async Task<PaymentVariantSummaryData> ForPaymentVariant(PaymentVar v, DbSet<PaymentVariantSummaryRow> table) {
             return new(v, (await FromDbSet(table, v.Year, v.AvNr))
                 .Select(r => new PaymentRow(r.Type, r.Variety, r.Attribute, r.Cultivation, r.QualityLevel, r.Oe,
-                    (r.WeightUngeb, r.MinPriceUngeb != null ? Utils.DecFromDb(r.MinPriceUngeb.Value, v.Season.Precision) : null, r.MaxPriceUngeb != null ? Utils.DecFromDb(r.MaxPriceUngeb.Value, v.Season.Precision) : null),
+                    (r.WeightUnCtrd, r.MinPriceUnCtrd != null ? Utils.DecFromDb(r.MinPriceUnCtrd.Value, v.Season.Precision) : null, r.MaxPriceUnCtrd != null ? Utils.DecFromDb(r.MaxPriceUnCtrd.Value, v.Season.Precision) : null),
-                    (r.WeightLowGeb, r.MinPriceLowGeb != null ? Utils.DecFromDb(r.MinPriceLowGeb.Value, v.Season.Precision) : null, r.MaxPriceLowGeb != null ? Utils.DecFromDb(r.MaxPriceLowGeb.Value, v.Season.Precision) : null),
+                    (r.WeightLowCtrd, r.MinPriceLowCtrd != null ? Utils.DecFromDb(r.MinPriceLowCtrd.Value, v.Season.Precision) : null, r.MaxPriceLowCtrd != null ? Utils.DecFromDb(r.MaxPriceLowCtrd.Value, v.Season.Precision) : null),
-                    (r.WeightGeb, r.MinPriceGeb != null ? Utils.DecFromDb(r.MinPriceGeb.Value, v.Season.Precision) : null, r.MaxPriceGeb != null ? Utils.DecFromDb(r.MaxPriceGeb.Value, v.Season.Precision) : null),
+                    (r.WeightCtrd, r.MinPriceCtrd != null ? Utils.DecFromDb(r.MinPriceCtrd.Value, v.Season.Precision) : null, r.MaxPriceCtrd != null ? Utils.DecFromDb(r.MaxPriceCtrd.Value, v.Season.Precision) : null),
                     Utils.DecFromDb(r.Amount, v.Season.Precision)))
                 .ToArray());
         }
@@ -59,15 +59,15 @@ namespace Elwig.Models.Dtos {
                        c.name AS cultivation,
                        q.name AS quality_level,
                        ROUND(kmw * (4.54 + 0.022 * kmw)) AS oe,
-                       SUM(IIF(w.discr = '_', w.value, 0)) AS weight_ungeb,
+                       SUM(IIF(w.discr = '_', w.value, 0)) AS weight_unctrd,
-                       MIN(IIF(w.discr = '_', b.price, NULL)) AS min_price_ungeb,
+                       MIN(IIF(w.discr = '_', b.price, NULL)) AS min_price_unctrd,
-                       MAX(IIF(w.discr = '_', b.price, NULL)) AS max_price_ungeb,
+                       MAX(IIF(w.discr = '_', b.price, NULL)) AS max_price_unctrd,
-                       SUM(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), w.value, 0)) AS weight_lowgeb,
+                       SUM(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), w.value, 0)) AS weight_lowctrd,
-                       MIN(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), b.price, NULL)) AS min_price_lowgeb,
+                       MIN(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), b.price, NULL)) AS min_price_lowctrd,
-                       MAX(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), b.price, NULL)) AS max_price_lowgeb,
+                       MAX(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), b.price, NULL)) AS max_price_lowctrd,
-                       SUM(IIF(w.discr = COALESCE(p.attrid, ''), w.value, 0)) AS weight_geb,
+                       SUM(IIF(w.discr = COALESCE(p.attrid, ''), w.value, 0)) AS weight_ctrd,
-                       MIN(IIF(w.discr = COALESCE(p.attrid, ''), b.price, NULL)) AS min_price_geb,
+                       MIN(IIF(w.discr = COALESCE(p.attrid, ''), b.price, NULL)) AS min_price_ctrd,
-                       MAX(IIF(w.discr = COALESCE(p.attrid, ''), b.price, NULL)) AS max_price_geb,
+                       MAX(IIF(w.discr = COALESCE(p.attrid, ''), b.price, NULL)) AS max_price_ctrd,
                        SUM(b.amount) AS amount
                 FROM payment_delivery_part_bucket b
                     LEFT JOIN delivery_part_bucket w ON (w.year, w.did, w.dpnr, w.bktnr) = (b.year, b.did, b.dpnr, b.bktnr)
@@ -97,24 +97,24 @@ namespace Elwig.Models.Dtos {
         public required string QualityLevel { get; set; }
         [Column("oe")]
         public double Oe { get; set; }
-        [Column("weight_ungeb")]
+        [Column("weight_unctrd")]
-        public int WeightUngeb { get; set; }
+        public int WeightUnCtrd { get; set; }
-        [Column("min_price_ungeb")]
+        [Column("min_price_unctrd")]
-        public long? MinPriceUngeb { get; set; }
+        public long? MinPriceUnCtrd { get; set; }
-        [Column("max_price_ungeb")]
+        [Column("max_price_unctrd")]
-        public long? MaxPriceUngeb { get; set; }
+        public long? MaxPriceUnCtrd { get; set; }
-        [Column("weight_lowgeb")]
+        [Column("weight_lowctrd")]
-        public int WeightLowGeb { get; set; }
+        public int WeightLowCtrd { get; set; }
-        [Column("min_price_lowgeb")]
+        [Column("min_price_lowctrd")]
-        public long? MinPriceLowGeb { get; set; }
+        public long? MinPriceLowCtrd { get; set; }
-        [Column("max_price_lowgeb")]
+        [Column("max_price_lowctrd")]
-        public long? MaxPriceLowGeb { get; set; }
+        public long? MaxPriceLowCtrd { get; set; }
-        [Column("weight_geb")]
+        [Column("weight_ctrd")]
-        public int WeightGeb { get; set; }
+        public int WeightCtrd { get; set; }
-        [Column("min_price_geb")]
+        [Column("min_price_ctrd")]
-        public long? MinPriceGeb { get; set; }
+        public long? MinPriceCtrd { get; set; }
-        [Column("max_price_geb")]
+        [Column("max_price_ctrd")]
-        public long? MaxPriceGeb { get; set; }
+        public long? MaxPriceCtrd { get; set; }
         [Column("amount")]
         public long Amount { get; set; }
     }

Elwig/Models/Dtos/WeightBreakdownData.cs

@@ -13,7 +13,7 @@ namespace Elwig.Models.Dtos {
             ("AttrId", "Attr.", null, 10),
             ("CultId", "Bewirt.", null, 15),
             ("QualId", "Qual.", null, 15),
-            ("Geb", "gebunden", null, 20),
+            ("Contracted", "gebunden", null, 20),
             ("Weight", "Menge", "kg", 20),
         ];
 
@@ -28,12 +28,12 @@ namespace Elwig.Models.Dtos {
         private static async Task<IEnumerable<WeightBreakdownRow>> FromDbSet(DbSet<WeightBreakdownRow> table, int year, string? zwstid) {
             zwstid = zwstid == null ? "NULL" : $"'{zwstid}'";
             return await table.FromSqlRaw($"""
-                SELECT type, sortid, attrid, cultid, v.qualid, geb, SUM(weight) AS weight
+                SELECT type, sortid, attrid, cultid, v.qualid, contracted, SUM(weight) AS weight
                 FROM v_stat_total v
                     LEFT JOIN wine_quality_level q ON q.qualid = v.qualid
                 WHERE year = {year} AND ({zwstid} IS NULL OR zwstid = {zwstid})
-                GROUP BY type, sortid, attrid, cultid, v.qualid, geb
+                GROUP BY type, sortid, attrid, cultid, v.qualid, contracted
-                ORDER BY type DESC, sortid, attrid, cultid, q.min_kmw, geb
+                ORDER BY type DESC, sortid, attrid, cultid, q.min_kmw, contracted
                 """).ToListAsync();
         }
     }
@@ -50,8 +50,8 @@ namespace Elwig.Models.Dtos {
         public string? CultId { get; set; }
         [Column("qualid")]
         public required string QualId { get; set; }
-        [Column("geb")]
+        [Column("contracted")]
-        public required string Geb { get; set; }
+        public required string Contracted { get; set; }
         [Column("weight")]
         public int Weight { get; set; }
     }

Elwig/Models/Entities/AreaCmt.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Elwig.Models.Entities {
     [Table("area_commitment"), PrimaryKey("FbNr", "RevNr")]
-    public class AreaCom {
+    public class AreaCmt {
         [Column("fbnr")]
         public int FbNr { get; set; }
 
@@ -65,13 +65,13 @@ namespace Elwig.Models.Entities {
         }
 
         [ForeignKey("FbNr")]
-        public virtual AreaComContract Contract { get; private set; } = null!;
+        public virtual AreaCmtContract Contract { get; private set; } = null!;
 
         [ForeignKey("MgNr")]
         public virtual Member Member { get; private set; } = null!;
 
         [ForeignKey("VtrgId")]
-        public virtual AreaComType AreaComType { get; private set; } = null!;
+        public virtual AreaCmtType AreaCmtType { get; private set; } = null!;
 
         [ForeignKey("CultId")]
         public virtual WineCult? WineCult { get; private set; }

Elwig/Models/Entities/AreaCmtContract.cs

@@ -7,7 +7,7 @@ using System.Linq;
 
 namespace Elwig.Models.Entities {
     [Table("area_commitment_contract"), PrimaryKey("FbNr")]
-    public class AreaComContract {
+    public class AreaCmtContract {
         [Column("fbnr")]
         public int FbNr { get; set; }
 
@@ -58,11 +58,11 @@ namespace Elwig.Models.Entities {
         [ForeignKey("KgNr, RdNr")]
         public virtual WbRd? Rd { get; private set; }
 
-        [InverseProperty(nameof(AreaCom.Contract))]
+        [InverseProperty(nameof(AreaCmt.Contract))]
-        public virtual ICollection<AreaCom> Revisions { get; private set; } = null!;
+        public virtual ICollection<AreaCmt> Revisions { get; private set; } = null!;
 
         [NotMapped]
-        public AreaCom? Latest => Revisions.OrderBy(r => r.RevNr).LastOrDefault();
+        public AreaCmt? Latest => Revisions.OrderBy(r => r.RevNr).LastOrDefault();
 
         [NotMapped]
         public int? YearFrom => Revisions.Any(r => r.YearFrom == null) ? null : Revisions.Min(r => r.YearFrom);

Elwig/Models/Entities/AreaCmtType.cs

@@ -5,7 +5,7 @@ using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models.Entities {
     [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId", "Discriminator", IsUnique = true)]
-    public class AreaComType {
+    public class AreaCmtType {
         [Column("vtrgid")]
         public required string VtrgId { get; set; }
 

Elwig/Models/Entities/DeliveryPart.cs

@@ -91,8 +91,8 @@ namespace Elwig.Models.Entities {
         [Column("hand_picked")]
         public bool? IsHandPicked { get; set; }
 
-        [Column("gebunden")]
+        [Column("contracted")]
-        public bool? IsGebunden { get; set; }
+        public bool? IsContracted { get; set; }
 
         [Column("unloading")]
         public string? Unloading { get; set; }

Elwig/Models/Entities/Member.cs

@@ -105,17 +105,17 @@ namespace Elwig.Models.Entities {
         [Column("juridical_pers")]
         public bool IsJuridicalPerson { get; set; }
 
-        [Column("volllieferant")]
+        [Column("full_delivery")]
-        public bool IsVollLieferant { get; set; }
+        public bool IsFullDelivery { get; set; }
 
-        [Column("buchführend")]
+        [Column("accounting")]
-        public bool IsBuchführend { get; set; }
+        public bool IsAccounting { get; set; }
 
         [Column("organic")]
         public bool IsOrganic { get; set; }
 
-        [Column("funktionär")]
+        [Column("officer")]
-        public bool IsFunktionär { get; set; }
+        public bool IsOfficer { get; set; }
 
         [Column("active")]
         public bool IsActive { get; set; }
@@ -199,10 +199,10 @@ namespace Elwig.Models.Entities {
         [ForeignKey("ZwstId")]
         public virtual Branch? Branch { get; private set; }
 
-        [InverseProperty(nameof(AreaCom.Member))]
+        [InverseProperty(nameof(AreaCmt.Member))]
-        public virtual ICollection<AreaCom> AreaCommitments { get; private set; } = null!;
+        public virtual ICollection<AreaCmt> AreaCommitments { get; private set; } = null!;
 
-        public IQueryable<AreaCom> ActiveAreaCommitments(AppDbContext ctx, int? year = null) {
+        public IQueryable<AreaCmt> ActiveAreaCommitments(AppDbContext ctx, int? year = null) {
             return ctx.AreaCommitments.Where(c => c.MgNr == MgNr).Where(Utils.ActiveAreaCommitments(year ?? Utils.CurrentYear));
         }
 

Elwig/Models/Entities/Season.cs

@@ -107,7 +107,7 @@ namespace Elwig.Models.Entities {
         [Column("calc_mode")]
         public int CalcMode { get; set; }
         [NotMapped]
-        public bool Billing_HonorGebunden {
+        public bool Billing_HonorContracted {
             get => (CalcMode & 0x1) != 0;
             set => CalcMode = value ? CalcMode | 0x1 : CalcMode & ~0x1;
         }

Elwig/Resources/Schemas/PaymentVariantData.json

@@ -97,6 +97,12 @@
             {"type": "number"},
             {"$ref": "#/definitions/curve_data"}
           ]
+        },
+        "contracted": {
+          "anyOf": [
+            {"type": "number"},
+            {"$ref": "#/definitions/curve_data"}
+          ]
         }
       }
     },

Elwig/Resources/Sql/41-42.sql

@@ -9,6 +9,30 @@ ALTER TABLE member_history RENAME COLUMN signed TO signed_member;
 ALTER TABLE member_history ADD COLUMN signed_company  INTEGER NOT NULL CHECK (signed_company IN (TRUE, FALSE)) DEFAULT FALSE;
 
 
+PRAGMA writable_schema = ON;
+
+UPDATE sqlite_schema SET sql = REPLACE(REPLACE(REPLACE(sql, 'funktionär', 'officer   '), 'buchführend', 'accounting '), 'volllieferant', 'full_delivery')
+WHERE type = 'table' AND name = 'member';
+
+UPDATE sqlite_schema SET sql = REPLACE(sql, 'gebunden', 'contracted')
+WHERE type = 'table' AND name = 'delivery_part';
+
+UPDATE sqlite_schema SET sql = REPLACE(sql, 'gebunden', 'contracted')
+WHERE type = 'view' AND name = 'v_delivery';
+
+UPDATE sqlite_schema SET sql = REPLACE(sql, 'volllieferant', 'full_delivery')
+WHERE type = 'view' AND name = 'v_bki_member';
+
+UPDATE sqlite_schema SET sql = REPLACE(sql, ' geb', ' contracted')
+WHERE type = 'view' AND name = 'v_stat_total';
+
+UPDATE sqlite_schema SET sql = REPLACE(sql, 'gebunden', 'contracted')
+WHERE type = 'view' AND (name = 'v_payment_bucket_strict' OR name = 'v_payment_bucket' OR name = 'v_under_delivery_bucket');
+
+PRAGMA schema_version = 4101;
+PRAGMA writable_schema = OFF;
+
+
 UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
 
 UPDATE member SET org_auth_code = UPPER(SUBSTR(a.name, -11, 10))

Elwig/Services/AreaCmtService.cs

@@ -8,9 +8,9 @@ using System.Threading.Tasks;
 using System.Windows.Controls;
 
 namespace Elwig.Services {
-    public static class AreaComService {
+    public static class AreaCmtService {
 
-        public static async Task InitInputs(this AreaComAdminViewModel vm) {
+        public static async Task InitInputs(this AreaCmtAdminViewModel vm) {
             using var ctx = new AppDbContext();
             vm.FbNr = await ctx.NextFbNr();
             vm.MgNr = vm.FilterMember.MgNr;
@@ -18,11 +18,11 @@ namespace Elwig.Services {
             vm.WineCult = null;
         }
 
-        public static void ClearInputs(this AreaComAdminViewModel vm) {
+        public static void ClearInputs(this AreaCmtAdminViewModel vm) {
             vm.Period = null;
         }
 
-        public static void FillInputs(this AreaComAdminViewModel vm, AreaComContract c) {
+        public static void FillInputs(this AreaCmtAdminViewModel vm, AreaCmtContract c) {
             vm.FbNr = c.FbNr;
             vm.Period = c.YearTo == null ? $"ab {c.YearFrom}" : $"{c.YearFrom}\u2013{c.YearTo}";
             vm.Comment = c.Comment;
@@ -30,23 +30,23 @@ namespace Elwig.Services {
             vm.Rd = ControlUtils.GetItemFromSourceWithPk(vm.RdSource, c.KgNr, c.RdNr) as WbRd;
         }
 
-        public static void FillInputs(this AreaComAdminViewModel vm, AreaCom a) {
+        public static void FillInputs(this AreaCmtAdminViewModel vm, AreaCmt a) {
             vm.MgNr = a.MgNr;
             vm.YearFrom = a.YearFrom;
             vm.YearTo = a.YearTo;
-            vm.AreaComType = ControlUtils.GetItemFromSourceWithPk(vm.AreaComTypeSource, a.VtrgId) as AreaComType;
+            vm.AreaCmtType = ControlUtils.GetItemFromSourceWithPk(vm.AreaCmtTypeSource, a.VtrgId) as AreaCmtType;
             vm.WineCult = ControlUtils.GetItemFromSourceWithPk(vm.WineCultSource, a.CultId) as WineCult;
             vm.GstNr = a.GstNr;
             vm.Area = a.Area;
         }
 
-        public static async Task<(List<string>, IQueryable<AreaComContract>, IQueryable<AreaCom>, List<string>)> GetFilters(this AreaComAdminViewModel vm, AppDbContext ctx) {
+        public static async Task<(List<string>, IQueryable<AreaCmtContract>, IQueryable<AreaCmt>, List<string>)> GetFilters(this AreaCmtAdminViewModel vm, AppDbContext ctx) {
             List<string> filterNames = [];
-            IQueryable<AreaCom> areaComQuery = ctx.AreaCommitments.Where(a => a.MgNr == vm.FilterMember.MgNr).OrderBy(a => a.FbNr);
+            IQueryable<AreaCmt> areaCmtQuery = ctx.AreaCommitments.Where(a => a.MgNr == vm.FilterMember.MgNr).OrderBy(a => a.FbNr);
             filterNames.Add(vm.FilterMember.AdministrativeName);
 
             if (vm.FilterSeason is int season) {
-                areaComQuery = Utils.ActiveAreaCommitments(areaComQuery, season);
+                areaCmtQuery = Utils.ActiveAreaCommitments(areaCmtQuery, season);
                 filterNames.Add($"laufend {season}");
             }
 
@@ -96,37 +96,37 @@ namespace Elwig.Services {
                     }
                 }
 
-                if (filterVar.Count > 0) areaComQuery = areaComQuery.Where(a => filterVar.Contains(a.AreaComType.WineVar.SortId));
+                if (filterVar.Count > 0) areaCmtQuery = areaCmtQuery.Where(a => filterVar.Contains(a.AreaCmtType.WineVar.SortId));
-                if (filterNotVar.Count > 0) areaComQuery = areaComQuery.Where(a => !filterNotVar.Contains(a.AreaComType.WineVar.SortId));
+                if (filterNotVar.Count > 0) areaCmtQuery = areaCmtQuery.Where(a => !filterNotVar.Contains(a.AreaCmtType.WineVar.SortId));
-                if (filterAttr.Count > 0) areaComQuery = areaComQuery.Where(a => a.AreaComType.WineAttr!.AttrId != null && filterAttr.Contains(a.AreaComType.WineAttr.AttrId));
+                if (filterAttr.Count > 0) areaCmtQuery = areaCmtQuery.Where(a => a.AreaCmtType.WineAttr!.AttrId != null && filterAttr.Contains(a.AreaCmtType.WineAttr.AttrId));
-                if (filterNotAttr.Count > 0) areaComQuery = areaComQuery.Where(a => a.AreaComType.WineAttr!.AttrId == null || !filterNotAttr.Contains(a.AreaComType.WineAttr.AttrId));
+                if (filterNotAttr.Count > 0) areaCmtQuery = areaCmtQuery.Where(a => a.AreaCmtType.WineAttr!.AttrId == null || !filterNotAttr.Contains(a.AreaCmtType.WineAttr.AttrId));
             }
 
-            IQueryable<AreaComContract> contracts = areaComQuery
+            IQueryable<AreaCmtContract> contracts = areaCmtQuery
                 .Select(c => c.Contract).Distinct()
                 .OrderBy(c => c.FbNr);
 
-            return (filterNames, contracts, areaComQuery, filter);
+            return (filterNames, contracts, areaCmtQuery, filter);
         }
 
-        public static async Task<(int FbNr, int RevNr)> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr, int? revNr) {
+        public static async Task<(int FbNr, int RevNr)> UpdateAreaCommitment(this AreaCmtAdminViewModel vm, int? oldFbNr, int? revNr) {
             int newFbNr = vm.FbNr!.Value;
 
             return await Task.Run(async () => {
                 using var ctx = new AppDbContext();
-                var c = new AreaComContract {
+                var c = new AreaCmtContract {
                     FbNr = oldFbNr ?? newFbNr,
                     Comment = string.IsNullOrWhiteSpace(vm.Comment) ? null : vm.Comment,
                     KgNr = vm.Kg!.KgNr,
                     RdNr = vm.Rd?.RdNr,
                 };
-                var a = new AreaCom {
+                var a = new AreaCmt {
                     FbNr = oldFbNr ?? newFbNr,
                     RevNr = revNr ?? await ctx.NextRevNr(oldFbNr ?? newFbNr),
                     MgNr = vm.MgNr!.Value,
                     YearFrom = vm.YearFrom,
                     YearTo = vm.YearTo,
-                    VtrgId = vm.AreaComType!.VtrgId,
+                    VtrgId = vm.AreaCmtType!.VtrgId,
                     CultId = vm.WineCult?.CultId,
                     GstNr = vm.GstNr?.Trim() ?? "-",
                     Area = vm.Area!.Value,
@@ -168,53 +168,53 @@ namespace Elwig.Services {
             grid.AddToolTipCell(max == null ? "" : $"{max:N0} kg", row, 4, bold: bold, alignRight: true);
         }
 
-        public static async Task<(string, (string?, string?, int, int?, int?)[])> GenerateToolTipData(IQueryable<AreaCom> areaComs, int maxKgPerHa) {
+        public static async Task<(string, (string?, string?, int, int?, int?)[])> GenerateToolTipData(IQueryable<AreaCmt> areaCmts, int maxKgPerHa) {
             var grid = new List<(string?, string?, int, int?, int?)>();
             var text = "-";
 
-            var area = await areaComs.SumAsync(p => p.Area);
+            var area = await areaCmts.SumAsync(p => p.Area);
             text = $"{area:N0} m²";
             grid.Add(("Geb. Fläche", null, area, null, null));
 
-            if (await areaComs.AnyAsync()) {
+            if (await areaCmts.AnyAsync()) {
-                var attrGroups = await areaComs
+                var attrGroups = await areaCmts
-                    .Where(c => c.AreaComType.WineAttr != null)
+                    .Where(c => c.AreaCmtType.WineAttr != null)
-                    .GroupBy(c => c.AreaComType.WineAttr!.Name)
+                    .GroupBy(c => c.AreaCmtType.WineAttr!.Name)
                     .Select(g => new {
                         Attr = g.Key,
                         Area = g.Sum(c => c.Area),
-                        Min = g.Sum(c => c.Area * (c.AreaComType.MinKgPerHa ?? 0) / 10_000),
+                        Min = g.Sum(c => c.Area * (c.AreaCmtType.MinKgPerHa ?? 0) / 10_000),
-                        Max = g.Sum(c => c.Area * (c.AreaComType.WineAttr!.MaxKgPerHa ?? maxKgPerHa) / 10_000),
+                        Max = g.Sum(c => c.Area * (c.AreaCmtType.WineAttr!.MaxKgPerHa ?? maxKgPerHa) / 10_000),
                     })
                     .OrderByDescending(g => g.Area)
                     .ThenBy(g => g.Attr)
                     .ToListAsync();
-                var groups = await areaComs
+                var groups = await areaCmts
-                    .Where(c => c.AreaComType.WineAttr != null)
+                    .Where(c => c.AreaCmtType.WineAttr != null)
                     .GroupBy(c => new {
-                        Attr = c.AreaComType.WineAttr!.Name,
+                        Attr = c.AreaCmtType.WineAttr!.Name,
-                        c.AreaComType.SortId,
+                        c.AreaCmtType.SortId,
                     })
                     .Select(g => new {
                         g.Key.Attr,
                         g.Key.SortId,
                         Area = g.Sum(c => c.Area),
-                        Min = g.Sum(c => c.Area * (c.AreaComType.MinKgPerHa ?? 0) / 10_000),
+                        Min = g.Sum(c => c.Area * (c.AreaCmtType.MinKgPerHa ?? 0) / 10_000),
-                        Max = g.Sum(c => c.Area * (c.AreaComType.WineAttr!.MaxKgPerHa ?? maxKgPerHa) / 10_000),
+                        Max = g.Sum(c => c.Area * (c.AreaCmtType.WineAttr!.MaxKgPerHa ?? maxKgPerHa) / 10_000),
                     })
                     .OrderByDescending(g => g.Area)
                     .ThenBy(g => g.Attr)
                     .ThenBy(g => g.SortId)
                     .ToListAsync();
 
-                var noAttr = await areaComs
+                var noAttr = await areaCmts
-                    .Where(c => c.AreaComType.WineAttr == null || !c.AreaComType.WineAttr.IsStrict)
+                    .Where(c => c.AreaCmtType.WineAttr == null || !c.AreaCmtType.WineAttr.IsStrict)
-                    .GroupBy(c => c.AreaComType.SortId)
+                    .GroupBy(c => c.AreaCmtType.SortId)
                     .Select(g => new {
                         SortId = g.Key,
                         Area = g.Sum(c => c.Area),
-                        Min = g.Sum(c => c.Area * (c.AreaComType.MinKgPerHa ?? 0) / 10_000),
+                        Min = g.Sum(c => c.Area * (c.AreaCmtType.MinKgPerHa ?? 0) / 10_000),
-                        Max = g.Sum(c => c.Area * (c.AreaComType.WineAttr!.MaxKgPerHa ?? maxKgPerHa) / 10_000),
+                        Max = g.Sum(c => c.Area * (c.AreaCmtType.WineAttr!.MaxKgPerHa ?? maxKgPerHa) / 10_000),
                     })
                     .OrderByDescending(g => g.Area)
                     .ThenBy(g => g.SortId)
@@ -254,7 +254,7 @@ namespace Elwig.Services {
             return grid;
         }
 
-        public static async Task DeleteAreaCom(int fbnr) {
+        public static async Task DeleteAreaCmt(int fbnr) {
             await Task.Run(async () => {
                 using var ctx = new AppDbContext();
                 var l = (await ctx.AreaCommitmentContracts.FindAsync(fbnr))!;
@@ -263,7 +263,7 @@ namespace Elwig.Services {
             });
         }
 
-        public static async Task DeleteAreaComRevision(int fbnr, int revnr) {
+        public static async Task DeleteAreaCmtRevision(int fbnr, int revnr) {
             await Task.Run(async () => {
                 using var ctx = new AppDbContext();
                 var l = (await ctx.AreaCommitments.FindAsync(fbnr, revnr))!;

Elwig/Services/DeliveryService.cs

@@ -75,7 +75,7 @@ namespace Elwig.Services {
             vm.TemperatureString = (p.Temperature != null) ? $"{p.Temperature:N1}" : "";
             vm.AcidString = (p.Acid != null) ? $"{p.Acid:N1}" : "";
             vm.IsHandPicked = p.IsHandPicked;
-            vm.IsGebunden = p.IsGebunden;
+            vm.IsContracted = p.IsContracted;
             vm.Unloading = p.Unloading;
 
             vm.ScaleTerminalId = p.ScaleTerminalId;
@@ -181,19 +181,19 @@ namespace Elwig.Services {
                         filter.RemoveAt(i--);
                         filterNames.Add("Weißweinsorten");
                     } else if (e.Length >= 3 && e.Length <= 8 && "gebunden".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
-                        prd = prd.And(p => p.IsGebunden == true);
+                        prd = prd.And(p => p.IsContracted == true);
                         filter.RemoveAt(i--);
                         filterNames.Add("gebunden");
                     } else if (e.Length >= 4 && e.Length <= 9 && "!gebunden".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
-                        prd = prd.And(p => p.IsGebunden != true);
+                        prd = prd.And(p => p.IsContracted != true);
                         filter.RemoveAt(i--);
                         filterNames.Add("nicht gebunden");
                     } else if (e.Length >= 5 && e.Length <= 10 && "ungebunden".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
-                        prd = prd.And(p => p.IsGebunden == false);
+                        prd = prd.And(p => p.IsContracted == false);
                         filter.RemoveAt(i--);
                         filterNames.Add("ungebunden");
                     } else if (e.Length >= 6 && e.Length <= 11 && "!ungebunden".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
-                        prd = prd.And(p => p.IsGebunden != false);
+                        prd = prd.And(p => p.IsContracted != false);
                         filter.RemoveAt(i--);
                         filterNames.Add("nicht ungebunden");
                     } else if (e.Length >= 5 && e.Length <= 8 && "handlese".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
@@ -556,7 +556,7 @@ namespace Elwig.Services {
 
                     IsNetWeight = vm.IsNetWeight,
                     IsHandPicked = vm.IsHandPicked,
-                    IsGebunden = vm.IsGebunden,
+                    IsContracted = vm.IsContracted,
                     Unloading = vm.Unloading,
                     Temperature = vm.Temperature,
                     Acid = vm.Acid,

Elwig/Services/MemberService.cs

@@ -116,7 +116,7 @@ namespace Elwig.Services {
             vm.LfbisNr = m.LfbisNr;
             vm.OrganicOperatorId = m.OrganicOperatorId;
             vm.OrganicAuthorityCode = m.OrganicAuthorityCode;
-            vm.IsBuchführend = m.IsBuchführend;
+            vm.IsAccounting = m.IsAccounting;
             vm.IsOrganic = m.IsOrganic;
 
             var billingAddr = m.BillingAddress;
@@ -150,8 +150,8 @@ namespace Elwig.Services {
             vm.DefaultKg = (AT_Kg?)ControlUtils.GetItemFromSourceWithPk(vm.DefaultKgSource, m.DefaultKgNr);
             vm.Comment = m.Comment;
             vm.IsActive = m.IsActive;
-            vm.IsVollLieferant = m.IsVollLieferant;
+            vm.IsFullDelivery = m.IsFullDelivery;
-            vm.IsFunktionär = m.IsFunktionär;
+            vm.IsOfficer = m.IsOfficer;
             vm.ContactViaPost = m.ContactViaPost;
             vm.ContactViaEmail = m.ContactViaEmail;
 
@@ -190,7 +190,7 @@ namespace Elwig.Services {
                     var s = await ctx.FetchSeasons().FirstOrDefaultAsync();
                     if (s != null) maxKgPerHa = s.MaxKgPerHa;
                 } catch { }
-                var (text, gridData) = await AreaComService.GenerateToolTipData(c, maxKgPerHa);
+                var (text, gridData) = await AreaCmtService.GenerateToolTipData(c, maxKgPerHa);
 
                 var deliveries = await ctx.Deliveries
                     .Where(d => d.MgNr == m.MgNr)
@@ -202,7 +202,7 @@ namespace Elwig.Services {
                         return;
                     var (d1Grid, _) = DeliveryService.GenerateToolTip(d1GridData, []);
                     var (d2Grid, _) = DeliveryService.GenerateToolTip(d2GridData, []);
-                    var grid = AreaComService.GenerateToolTip(gridData);
+                    var grid = AreaCmtService.GenerateToolTip(gridData);
                     vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
                     vm.StatusDeliveriesLastSeason = textLast;
                     vm.StatusDeliveriesLastSeasonToolTip = d1Grid;
@@ -297,15 +297,15 @@ namespace Elwig.Services {
             var filterKgNr = new List<int>();
             var filterLfbisNr = new List<string>();
             var filterUstIdNr = new List<string>();
-            var filterAreaCom = new List<string>();
+            var filterAreaCmt = new List<string>();
-            var filterNotAreaCom = new List<string>();
+            var filterNotAreaCmt = new List<string>();
 
             var filter = vm.TextFilter;
             if (filter.Count > 0) {
                 var branches = await ctx.FetchBranches().ToListAsync();
                 var mgnr = await ctx.FetchMembers(includeNotActive: true).ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
                 var kgs = await ctx.WbKgs.ToDictionaryAsync(k => k.AtKg.Name.ToLower(), k => k.AtKg);
-                var areaComs = await ctx.AreaCommitmentTypes.ToDictionaryAsync(t => $"{t.SortId}{t.AttrId}", t => t);
+                var areaCmts = await ctx.AreaCommitmentTypes.ToDictionaryAsync(t => $"{t.SortId}{t.AttrId}", t => t);
 
                 for (int i = 0; i < filter.Count; i++) {
                     var e = filter[i];
@@ -319,11 +319,11 @@ namespace Elwig.Services {
                         filter.RemoveAt(i--);
                         filterNames.Add("inaktive Mitglieder");
                     } else if (e.Length >= 5 && e.Length <= 10 && "funktionär".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
-                        memberQuery = memberQuery.Where(m => m.IsFunktionär);
+                        memberQuery = memberQuery.Where(m => m.IsOfficer);
                         filter.RemoveAt(i--);
                         filterNames.Add("Funktionäre");
                     } else if (e.Length >= 6 && e.Length <= 11 && e[0] == '!' && "funktionär".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
-                        memberQuery = memberQuery.Where(m => !m.IsFunktionär);
+                        memberQuery = memberQuery.Where(m => !m.IsOfficer);
                         filter.RemoveAt(i--);
                         filterNames.Add("Nicht-Funktionäre");
                     } else if (e.Equals("bio", StringComparison.CurrentCultureIgnoreCase)) {
@@ -334,28 +334,36 @@ namespace Elwig.Services {
                         memberQuery = memberQuery.Where(m => !m.IsOrganic);
                         filter.RemoveAt(i--);
                         filterNames.Add("Nicht-Bio-Betriebe");
+                    } else if (e.Length >= 4 && e.Length <= 14 && "vollablieferer".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => m.IsFullDelivery);
+                        filter.RemoveAt(i--);
+                        filterNames.Add("Vollablieferer");
                     } else if (e.Length >= 4 && e.Length <= 13 && "volllieferant".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
-                        memberQuery = memberQuery.Where(m => m.IsVollLieferant);
+                        memberQuery = memberQuery.Where(m => m.IsFullDelivery);
                         filter.RemoveAt(i--);
-                        filterNames.Add("Volllieferanten");
+                        filterNames.Add("Vollablieferer");
+                    } else if (e.Length >= 5 && e.Length <= 15 && e[0] == '!' && "vollablieferer".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => !m.IsFullDelivery);
+                        filter.RemoveAt(i--);
+                        filterNames.Add("Nicht-Vollablieferer");
                     } else if (e.Length >= 5 && e.Length <= 14 && e[0] == '!' && "volllieferant".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
-                        memberQuery = memberQuery.Where(m => !m.IsVollLieferant);
+                        memberQuery = memberQuery.Where(m => !m.IsFullDelivery);
                         filter.RemoveAt(i--);
-                        filterNames.Add("Nicht-Vollieferanten");
+                        filterNames.Add("Nicht-Vollablieferer");
                     } else if (e.Length >= 5 && e.Length <= 11 && "buchführend".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
-                        memberQuery = memberQuery.Where(m => m.IsBuchführend);
+                        memberQuery = memberQuery.Where(m => m.IsAccounting);
                         filter.RemoveAt(i--);
                         filterNames.Add("buchführend");
                     } else if (e.Length >= 6 && e.Length <= 12 && e[0] == '!' && "buchführend".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
-                        memberQuery = memberQuery.Where(m => !m.IsBuchführend);
+                        memberQuery = memberQuery.Where(m => !m.IsAccounting);
                         filter.RemoveAt(i--);
                         filterNames.Add("pauschaliert");
                     } else if (e.Length >= 8 && e.Length <= 12 && "pauschaliert".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
-                        memberQuery = memberQuery.Where(m => !m.IsBuchführend);
+                        memberQuery = memberQuery.Where(m => !m.IsAccounting);
                         filter.RemoveAt(i--);
                         filterNames.Add("pauschaliert");
                     } else if (e.Length >= 9 && e.Length <= 13 && e[0] == '!' && "pauschaliert".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
-                        memberQuery = memberQuery.Where(m => m.IsBuchführend);
+                        memberQuery = memberQuery.Where(m => m.IsAccounting);
                         filter.RemoveAt(i--);
                         filterNames.Add("buchführend");
                     } else if (e.Equals("email", StringComparison.CurrentCultureIgnoreCase)) {
@@ -426,19 +434,19 @@ namespace Elwig.Services {
                         filter.RemoveAt(i--);
                         filterNames.Add($"Tel.-Nr. {e}");
                     } else if (e.Length >= 5 && e.Length <= 14 && "flächenbindung".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
-                        filterAreaCom.AddRange(areaComs.Keys);
+                        filterAreaCmt.AddRange(areaCmts.Keys);
                         filter.RemoveAt(i--);
                         filterNames.Add($"Flächenbindung");
                     } else if (e.Length >= 6 && e.Length <= 15 && "!flächenbindung".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
-                        filterNotAreaCom.AddRange(areaComs.Keys);
+                        filterNotAreaCmt.AddRange(areaCmts.Keys);
                         filter.RemoveAt(i--);
                         filterNames.Add($"keine Flächenbindung");
-                    } else if (areaComs.ContainsKey(e.ToUpper())) {
+                    } else if (areaCmts.ContainsKey(e.ToUpper())) {
-                        filterAreaCom.Add(e.ToUpper());
+                        filterAreaCmt.Add(e.ToUpper());
                         filter.RemoveAt(i--);
                         filterNames.Add($"Flächenbindung {e.ToUpper()}");
-                    } else if (e.Length >= 3 && e[0] == '!' && areaComs.ContainsKey(e[1..].ToUpper())) {
+                    } else if (e.Length >= 3 && e[0] == '!' && areaCmts.ContainsKey(e[1..].ToUpper())) {
-                        filterNotAreaCom.Add(e[1..].ToUpper());
+                        filterNotAreaCmt.Add(e[1..].ToUpper());
                         filter.RemoveAt(i--);
                         filterNames.Add($"ohne Flächenbindung {e[1..].ToUpper()}");
                     } else if (Validator.CheckLfbisNr(e)) {
@@ -459,8 +467,8 @@ namespace Elwig.Services {
                 if (filterMgNr.Count > 0) memberQuery = memberQuery.Where(m => filterMgNr.Contains(m.MgNr));
                 if (filterKgNr.Count > 0) memberQuery = memberQuery.Where(m => m.DefaultKgNr != null && filterKgNr.Contains((int)m.DefaultKgNr));
                 if (filterZwst.Count > 0) memberQuery = memberQuery.Where(m => m.ZwstId != null && filterZwst.Contains(m.ZwstId));
-                if (filterAreaCom.Count > 0) memberQuery = memberQuery.Where(m => m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Utils.CurrentLastSeason)).Any(c => filterAreaCom.Contains(c.VtrgId)));
+                if (filterAreaCmt.Count > 0) memberQuery = memberQuery.Where(m => m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Utils.CurrentLastSeason)).Any(c => filterAreaCmt.Contains(c.VtrgId)));
-                if (filterNotAreaCom.Count > 0) memberQuery = memberQuery.Where(m => !m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Utils.CurrentLastSeason)).All(c => filterNotAreaCom.Contains(c.VtrgId)));
+                if (filterNotAreaCmt.Count > 0) memberQuery = memberQuery.Where(m => !m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Utils.CurrentLastSeason)).All(c => filterNotAreaCmt.Contains(c.VtrgId)));
                 if (filterLfbisNr.Count > 0) memberQuery = memberQuery.Where(m => m.LfbisNr != null && filterLfbisNr.Contains(m.LfbisNr));
                 if (filterUstIdNr.Count > 0) memberQuery = memberQuery.Where(m => m.UstIdNr != null && filterUstIdNr.Contains(m.UstIdNr));
             }
@@ -577,7 +585,7 @@ namespace Elwig.Services {
                             .DistinctBy(h => h.HistNr)
                             .OrderBy(h => h.DateNotice).ThenBy(h => h.HistNr)
                             .ToList();
-                        var areaComs = await query
+                        var areaCmts = await query
                             .SelectMany(m => m.AreaCommitments)
                             .Select(c => c.Contract).Distinct()
                             .Include(c => c.Revisions)
@@ -585,11 +593,11 @@ namespace Elwig.Services {
                         var wbKgs = members
                             .Where(m => m.DefaultWbKg != null)
                             .Select(m => m.DefaultWbKg!)
-                            .Union(areaComs.Select(c => c.Kg))
+                            .Union(areaCmts.Select(c => c.Kg))
                             .Distinct()
                             .OrderBy(k => k.KgNr)
                             .ToList();
-                        await ElwigData.Export(filename, members, history, areaComs, wbKgs, filterNames);
+                        await ElwigData.Export(filename, members, history, areaCmts, wbKgs, filterNames);
                     });
                 }
             } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
@@ -629,7 +637,7 @@ namespace Elwig.Services {
                 LfbisNr = string.IsNullOrWhiteSpace(vm.LfbisNr) ? null : vm.LfbisNr,
                 OrganicOperatorId = string.IsNullOrWhiteSpace(vm.OrganicOperatorId) ? null : vm.OrganicOperatorId,
                 OrganicAuthorityCode = string.IsNullOrWhiteSpace(vm.OrganicAuthorityCode) ? null : vm.OrganicAuthorityCode,
-                IsBuchführend = vm.IsBuchführend,
+                IsAccounting = vm.IsAccounting,
                 IsOrganic = vm.IsOrganic,
 
                 EntryDateString = string.IsNullOrWhiteSpace(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
@@ -640,8 +648,8 @@ namespace Elwig.Services {
                 SharesDormant = App.Client.HasRedWhite ? vm.BusinessShares3 ?? 0 : vm.BusinessShares2 ?? 0,
                 AccountingNr = string.IsNullOrWhiteSpace(vm.AccountingNr) ? null : vm.AccountingNr,
                 IsActive = vm.IsActive,
-                IsVollLieferant = vm.IsVollLieferant,
+                IsFullDelivery = vm.IsFullDelivery,
-                IsFunktionär = vm.IsFunktionär,
+                IsOfficer = vm.IsOfficer,
                 ZwstId = vm.Branch?.ZwstId,
                 DefaultKgNr = vm.DefaultKg?.KgNr,
                 Comment = string.IsNullOrWhiteSpace(vm.Comment) ? null : vm.Comment,
@@ -692,12 +700,12 @@ namespace Elwig.Services {
 
                 await ctx.SaveChangesAsync();
 
-                if (vm.TransferPredecessorAreaComs is int year && m.PredecessorMgNr is int predecessor) {
+                if (vm.TransferPredecessorAreaCmts is int year && m.PredecessorMgNr is int predecessor) {
-                    var areaComs = await ctx.AreaCommitments
+                    var areaCmts = await ctx.AreaCommitments
                         .Where(c => c.MgNr == predecessor && (c.YearTo == null || c.YearTo >= year))
                         .ToListAsync();
 
-                    ctx.AddRange(await Task.WhenAll(areaComs.Select(async (c, i) => new AreaCom {
+                    ctx.AddRange(await Task.WhenAll(areaCmts.Select(async (c, i) => new AreaCmt {
                         FbNr = c.FbNr,
                         RevNr = await ctx.NextRevNr(c.FbNr),
                         MgNr = m.MgNr,
@@ -709,24 +717,24 @@ namespace Elwig.Services {
                         YearTo = c.YearTo,
                     })));
 
-                    foreach (var ac in areaComs)
+                    foreach (var ac in areaCmts)
                         ac.YearTo = year - 1;
-                    ctx.UpdateRange(areaComs);
+                    ctx.UpdateRange(areaCmts);
                     await ctx.SaveChangesAsync();
                 }
-                vm.TransferPredecessorAreaComs = null;
+                vm.TransferPredecessorAreaCmts = null;
 
-                if (vm.CancelAreaComs is int yearTo) {
+                if (vm.CancelAreaCmts is int yearTo) {
-                    var areaComs = await ctx.AreaCommitments
+                    var areaCmts = await ctx.AreaCommitments
                         .Where(c => c.MgNr == m.MgNr && (c.YearTo == null || c.YearTo > yearTo))
                         .ToListAsync();
 
-                    foreach (var ac in areaComs)
+                    foreach (var ac in areaCmts)
                         ac.YearTo = yearTo;
-                    ctx.UpdateRange(areaComs);
+                    ctx.UpdateRange(areaCmts);
                     await ctx.SaveChangesAsync();
                 }
-                vm.CancelAreaComs = null;
+                vm.CancelAreaCmts = null;
 
                 if (newMgNr != m.MgNr) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
@@ -736,7 +744,7 @@ namespace Elwig.Services {
             });
         }
 
-        public static async Task DeleteMember(int mgnr, bool deletePaymentData, bool deleteDeliveries, bool deleteAreaComs) {
+        public static async Task DeleteMember(int mgnr, bool deletePaymentData, bool deleteDeliveries, bool deleteAreaCmts) {
             await Task.Run(async () => {
                 using var ctx = new AppDbContext();
                 using var tx = await ctx.Database.BeginTransactionAsync();
@@ -747,7 +755,7 @@ namespace Elwig.Services {
                 if (deleteDeliveries) {
                     await ctx.Deliveries.Where(c => c.MgNr == mgnr).ExecuteDeleteAsync();
                 }
-                if (deleteAreaComs) {
+                if (deleteAreaCmts) {
                     await ctx.AreaCommitments.Where(c => c.MgNr == mgnr).ExecuteDeleteAsync();
                 }
                 ctx.Remove(l);

Elwig/Services/OrganicService.cs

@@ -1,6 +1,7 @@
 using Elwig.Helpers;
 using Elwig.Models.Entities;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -47,7 +48,7 @@ namespace Elwig.Services {
                 (CategoriesOfProduct.Contains(TracesCategoryOfProduct.UNPROCESSED_PLANT_PRODUCTS_INCLUDING_SEEDS) || CategoriesOfProduct.Contains(TracesCategoryOfProduct.WINE));
         }
 
-        private static readonly Dictionary<int, (DateTime Timestamp, TracesCertificate[] Certificates)> _memberCerts = [];
+        private static readonly ConcurrentDictionary<int, (DateTime Timestamp, TracesCertificate[] Certificates)> _memberCerts = [];
 
         public async static Task<TracesCertificate[]> GetTracesCertificates(Member m, bool? tryNameAndAddress = null) {
             if (_memberCerts.TryGetValue(m.MgNr, out var entry) && entry.Timestamp >= DateTime.Now.AddDays(-1))

Elwig/Services/PaymentVariantService.cs

@@ -159,10 +159,10 @@ namespace Elwig.Services {
                     foreach (int mgnr in currentPayments.Keys) {
                         var c = currentPayments[mgnr];
                         var l = lastPayments.GetValueOrDefault(mgnr);
-                        vatSum += (c.Amount - (l?.Amount ?? 0)) * (decimal)(c.Member.IsBuchführend ? v.Season.VatNormal : v.Season.VatFlatrate);
+                        vatSum += (c.Amount - (l?.Amount ?? 0)) * (decimal)(c.Member.IsAccounting ? v.Season.VatNormal : v.Season.VatFlatrate);
                     }
                 } else {
-                    vatSum = currentPayments.Sum(e => e.Value.Amount * (decimal)(e.Value.Member.IsBuchführend ? v.Season.VatNormal : v.Season.VatFlatrate));
+                    vatSum = currentPayments.Sum(e => e.Value.Amount * (decimal)(e.Value.Member.IsAccounting ? v.Season.VatNormal : v.Season.VatFlatrate));
                 }
                 vatText = $"~{vatSum:N2} {sym}";
                 deductionText = $"- {sym}";

Elwig/Services/SyncService.cs

@@ -15,7 +15,7 @@ namespace Elwig.Services {
     public static class SyncService {
 
         public static readonly Expression<Func<Member, bool>> ChangedMembers = (m) => ((m.XTime == null && m.MTime > 1751328000) || m.MTime > m.XTime) && (m.ITime == null || m.MTime > m.ITime);
-        public static readonly Expression<Func<AreaComContract, bool>> ChangedAreaComContracts = (c) => ((c.XTime == null && c.MTime > 1751328000) || c.MTime > c.XTime) && (c.ITime == null || c.MTime > c.ITime);
+        public static readonly Expression<Func<AreaCmtContract, bool>> ChangedAreaCmtContracts = (c) => ((c.XTime == null && c.MTime > 1751328000) || c.MTime > c.XTime) && (c.ITime == null || c.MTime > c.ITime);
         public static readonly Expression<Func<Delivery, bool>> ChangedDeliveries = (d) => ((d.XTime == null && d.MTime > 1751328000) || d.MTime > d.XTime) && (d.ITime == null || d.MTime > d.ITime);
 
         public static async Task Upload(string url, string username, string password, IQueryable<Member> query, IEnumerable<string> filterNames) {
@@ -37,7 +37,7 @@ namespace Elwig.Services {
                     .DistinctBy(h => h.HistNr)
                     .OrderBy(h => h.DateNotice).ThenBy(h => h.HistNr)
                     .ToList();
-                var areaComs = await query
+                var areaCmts = await query
                     .SelectMany(m => m.AreaCommitments)
                     .Select(c => c.Contract).Distinct()
                     .OrderBy(c => c.FbNr)
@@ -46,7 +46,7 @@ namespace Elwig.Services {
                 var wbKgs = members
                     .Where(m => m.DefaultWbKg != null)
                     .Select(m => m.DefaultWbKg!)
-                    .Union(areaComs.Select(c => c.Kg))
+                    .Union(areaCmts.Select(c => c.Kg))
                     .Distinct()
                     .OrderBy(k => k.KgNr)
                     .ToList();
@@ -54,9 +54,9 @@ namespace Elwig.Services {
                     InteractionService.ShowError("Mitglieder hochladen", "Es wurden keine Mitglieder zum Hochladen ausgewählt!");
                 } else {
                     var exportedAt = DateTime.Now;
-                    await ElwigData.Export(path, members, history, areaComs, wbKgs, filterNames);
+                    await ElwigData.Export(path, members, history, areaCmts, wbKgs, filterNames);
                     await Utils.UploadExportData(path, url, username, password);
-                    await UpdateExportedAt(members, areaComs, [], exportedAt);
+                    await UpdateExportedAt(members, areaCmts, [], exportedAt);
                     InteractionService.ShowInformation("Mitglieder hochgeladen", $"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!");
                 }
             } catch (HttpRequestException exc) {
@@ -106,7 +106,7 @@ namespace Elwig.Services {
             try {
                 var path = Path.Combine(App.TempPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip");
                 List<Member> members;
-                List<AreaComContract> areaComs;
+                List<AreaCmtContract> areaCmts;
                 List<Delivery> deliveries;
                 using (var ctx = new AppDbContext()) {
                     members = await ctx.Members
@@ -115,8 +115,8 @@ namespace Elwig.Services {
                         .Include(m => m.EmailAddresses)
                         .OrderBy(m => m.MgNr)
                         .ToListAsync();
-                    areaComs = await ctx.AreaCommitmentContracts
+                    areaCmts = await ctx.AreaCommitmentContracts
-                       .Where(ChangedAreaComContracts)
+                       .Where(ChangedAreaCmtContracts)
                        .Include(c => c.Revisions)
                        .OrderBy(c => c.FbNr)
                        .ToListAsync();
@@ -129,7 +129,7 @@ namespace Elwig.Services {
                 var wbKgs = members
                     .Where(m => m.DefaultWbKg != null)
                     .Select(m => m.DefaultWbKg!)
-                    .Union(areaComs.Select(c => c.Kg))
+                    .Union(areaCmts.Select(c => c.Kg))
                     .Union(deliveries.SelectMany(d => d.Parts)
                         .Where(p => p.Kg != null)
                         .Select(p => p.Kg!))
@@ -142,13 +142,13 @@ namespace Elwig.Services {
                     var exportedAt = DateTime.Now;
                     await (new ElwigData.ElwigExport {
                         Members = (members, ["geändert seit letztem Export"]),
-                        AreaComs = (areaComs, ["geändert seit letztem Export"]),
+                        AreaCmts = (areaCmts, ["geändert seit letztem Export"]),
                         Deliveries = (deliveries, ["geändert seit letzem Export"]),
                         WbKgs = (wbKgs, ["von exportierten Mitgliedern, Flächenbindungen und Lieferungen"]),
                     }).Export(path);
                     await Utils.UploadExportData(path, url, username, password);
-                    await UpdateExportedAt(members, areaComs, deliveries, exportedAt);
+                    await UpdateExportedAt(members, areaCmts, deliveries, exportedAt);
-                    InteractionService.ShowInformation("Mitglieder und Lieferungen hochladen", $"Hochladen von {members.Count:N0} Mitgliedern, {areaComs.Count:N0} Flächenbindungsverträgen, und {deliveries.Count:N0} Lieferungen erfolgreich!");
+                    InteractionService.ShowInformation("Mitglieder und Lieferungen hochladen", $"Hochladen von {members.Count:N0} Mitgliedern, {areaCmts.Count:N0} Flächenbindungsverträgen, und {deliveries.Count:N0} Lieferungen erfolgreich!");
                 }
             } catch (HttpRequestException exc) {
                 InteractionService.ShowException("Mitglieder und Lieferungen hochladen", "Eventuell Internetverbindung prüfen!", exc);
@@ -236,7 +236,7 @@ namespace Elwig.Services {
             }
         }
 
-        private static async Task UpdateExportedAt(IEnumerable<Member> member, IEnumerable<AreaComContract> contracts, IEnumerable<Delivery> deliveries, DateTime dateTime) {
+        private static async Task UpdateExportedAt(IEnumerable<Member> member, IEnumerable<AreaCmtContract> contracts, IEnumerable<Delivery> deliveries, DateTime dateTime) {
             var timestamp = ((DateTimeOffset)dateTime.ToUniversalTime()).ToUnixTimeSeconds();
             var mgnrs = string.Join(",", member.Select(m => $"{m.MgNr}").Append("0"));
             var fbnrs = string.Join(",", contracts.Select(c => $"{c.FbNr}").Append("0"));
@@ -259,7 +259,7 @@ namespace Elwig.Services {
 
         public static async Task<bool> ChangesAvailable(AppDbContext ctx, string url, string username, string password) {
             try {
-                return await ctx.Members.Where(ChangedMembers).AnyAsync() || await ctx.AreaCommitmentContracts.Where(ChangedAreaComContracts).AnyAsync() || await ctx.Deliveries.Where(ChangedDeliveries).AnyAsync() || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
+                return await ctx.Members.Where(ChangedMembers).AnyAsync() || await ctx.AreaCommitmentContracts.Where(ChangedAreaCmtContracts).AnyAsync() || await ctx.Deliveries.Where(ChangedDeliveries).AnyAsync() || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
             } catch {
                 return false;
             }

Elwig/ViewModels/AreaCmtAdminViewModel.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Windows.Controls;
 
 namespace Elwig.ViewModels {
-    public partial class AreaComAdminViewModel : ObservableObject {
+    public partial class AreaCmtAdminViewModel : ObservableObject {
 
         [ObservableProperty]
         public partial string Title { get; set; } = "Flächenbindungen - Elwig";
@@ -54,9 +54,9 @@ namespace Elwig.ViewModels {
         public partial string? Period { get; set; }
 
         [ObservableProperty]
-        public partial AreaComType? AreaComType { get; set; }
+        public partial AreaCmtType? AreaCmtType { get; set; }
         [ObservableProperty]
-        public partial IEnumerable<AreaComType> AreaComTypeSource { get; set; } = [];
+        public partial IEnumerable<AreaCmtType> AreaCmtTypeSource { get; set; } = [];
         [ObservableProperty]
         public partial object? WineCultObj { get; set; }
         public WineCult? WineCult {

Elwig/ViewModels/DeliveryAdminViewModel.cs

@@ -157,7 +157,7 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         public partial IEnumerable<object> WineRdSource { get; set; } = [];
         [ObservableProperty]
-        public partial bool? IsGebunden { get; set; }
+        public partial bool? IsContracted { get; set; }
 
         public ObservableCollection<Modifier> Modifiers { get; set; } = [];
         [ObservableProperty]

Elwig/ViewModels/MemberAdminViewModel.cs

@@ -14,8 +14,8 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         public partial string Title { get; set; } = "Mitglieder - Elwig";
 
-        public int? TransferPredecessorAreaComs { get; set; } = null;
+        public int? TransferPredecessorAreaCmts { get; set; } = null;
-        public int? CancelAreaComs { get; set; } = null;
+        public int? CancelAreaCmts { get; set; } = null;
 
         public ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes);
 
@@ -125,7 +125,7 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         public partial string? OrganicAuthorityCode { get; set; }
         [ObservableProperty]
-        public partial bool IsBuchführend { get; set; }
+        public partial bool IsAccounting { get; set; }
         [ObservableProperty]
         public partial bool IsOrganic { get; set; }
 
@@ -165,9 +165,9 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         public partial bool IsActive { get; set; }
         [ObservableProperty]
-        public partial bool IsVollLieferant { get; set; }
+        public partial bool IsFullDelivery { get; set; }
         [ObservableProperty]
-        public partial bool IsFunktionär { get; set; }
+        public partial bool IsOfficer { get; set; }
         [ObservableProperty]
         public partial Branch? Branch { get; set; }
         [ObservableProperty]

Elwig/Windows/AdministrationWindow.cs

@@ -608,8 +608,8 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckUpperCase);
         }
 
-        protected void AreaComTypeDetailsButton_Click(object sender, RoutedEventArgs? evt) {
+        protected void AreaCmtTypeDetailsButton_Click(object sender, RoutedEventArgs? evt) {
-            App.FocusBaseDataAreaComType();
+            App.FocusBaseDataAreaCmtType();
         }
 
         protected void AddressInput_TextChanged(object sender, TextChangedEventArgs? evt) {

Elwig/Windows/AreaCmtAdminWindow.xaml

@@ -1,5 +1,5 @@
 <local:AdministrationWindow
-        x:Class="Elwig.Windows.AreaComAdminWindow"
+        x:Class="Elwig.Windows.AreaCmtAdminWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -9,7 +9,7 @@
         xmlns:vm="clr-namespace:Elwig.ViewModels"
         Title="{Binding Title}" Height="600" MinHeight="550" Width="1000" MinWidth="860">
     <Window.DataContext>
-        <vm:AreaComAdminViewModel/>
+        <vm:AreaCmtAdminViewModel/>
     </Window.DataContext>
     <Window.Resources>
         <Style TargetType="Label">
@@ -110,10 +110,10 @@
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
                     <DataGridTextColumn Header="Katastralgemeinde" Binding="{Binding Kg.AtKg.Name}" Width="130"/>
-                    <DataGridTextColumn Header="Sorte" Binding="{Binding Latest.AreaComType.VtrgId}" Width="50">
+                    <DataGridTextColumn Header="Sorte" Binding="{Binding Latest.AreaCmtType.VtrgId}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
-                                <Setter Property="TextBlock.Foreground" Value="{Binding Latest.AreaComType.WineVar.Color}"/>
+                                <Setter Property="TextBlock.Foreground" Value="{Binding Latest.AreaCmtType.WineVar.Color}"/>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
@@ -229,7 +229,7 @@
                                     <TextBlock Text="{Binding YearFrom}" Width="28" TextAlignment="Right" Margin="0,0,0,0"/>
                                     <TextBlock Text="&#x2013;" TextAlignment="Center" Margin="0,0,0,0"/>
                                     <TextBlock Text="{Binding YearTo}" Width="28" TextAlignment="Left" Margin="0,0,0,0"/>
-                                    <TextBlock Text="{Binding VtrgId}" Width="40" TextAlignment="Center" Foreground="{Binding AreaComType.WineVar.Color}"/>
+                                    <TextBlock Text="{Binding VtrgId}" Width="40" TextAlignment="Center" Foreground="{Binding AreaCmtType.WineVar.Color}"/>
                                     <TextBlock Text="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
                                     <TextBlock Text="{Binding Member.AdministrativeName}"/>
                                 </StackPanel>
@@ -268,11 +268,11 @@
                              TextChanged="IntegerInput_TextChanged"/>
 
                     <Label Content="Vertragsart:" Margin="10,70,0,0" Grid.Column="0"/>
-                    <ComboBox x:Name="AreaComTypeInput" SelectedItem="{Binding AreaComType, Mode=TwoWay}" ItemsSource="{Binding AreaComTypeSource, Mode=TwoWay}"
+                    <ComboBox x:Name="AreaCmtTypeInput" SelectedItem="{Binding AreaCmtType, Mode=TwoWay}" ItemsSource="{Binding AreaCmtTypeSource, Mode=TwoWay}"
                               ItemTemplate="{StaticResource AreaCommitmentTypeTemplate}" TextSearch.TextPath="DisplayName"
                               HorizontalAlignment="Stretch" Margin="0,70,40,10" Grid.Column="1"/>
-                    <Button x:Name="AreaComTypeDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
+                    <Button x:Name="AreaCmtTypeDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
-                            Click="AreaComTypeDetailsButton_Click"
+                            Click="AreaCmtTypeDetailsButton_Click"
                             Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,70,10,10"/>
 
                     <Label Content="Bewirt.-Art:" Margin="10,100,0,0" Grid.Column="0"/>

Elwig/Windows/AreaCmtAdminWindow.xaml.cs

@@ -12,13 +12,13 @@ using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace Elwig.Windows {
-    public partial class AreaComAdminWindow : AdministrationWindow {
+    public partial class AreaCmtAdminWindow : AdministrationWindow {
 
-        public AreaComAdminViewModel ViewModel => (AreaComAdminViewModel)DataContext;
+        public AreaCmtAdminViewModel ViewModel => (AreaCmtAdminViewModel)DataContext;
 
-        private readonly RoutedCommand CtrlF = new("CtrlF", typeof(AreaComAdminWindow), [new KeyGesture(Key.F, ModifierKeys.Control)]);
+        private readonly RoutedCommand CtrlF = new("CtrlF", typeof(AreaCmtAdminWindow), [new KeyGesture(Key.F, ModifierKeys.Control)]);
 
-        public AreaComAdminWindow(int mgnr) {
+        public AreaCmtAdminWindow(int mgnr) {
             InitializeComponent();
             CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput));
             using var ctx = new AppDbContext();
@@ -30,7 +30,7 @@ namespace Elwig.Windows {
             ];
             RequiredInputs = [
                 FbNrInput, MgNrInput, MemberInput, YearFromInput, KgInput, RdInput,
-                GstNrInput, AreaInput, AreaComTypeInput, WineCultivationInput
+                GstNrInput, AreaInput, AreaCmtTypeInput, WineCultivationInput
             ];
 
             ControlUtils.InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
@@ -50,13 +50,13 @@ namespace Elwig.Windows {
             var cursor = Mouse.OverrideCursor != null;
             if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
             var query = (vm.SearchQuery, vm.FilterSeason);
-            var (filterNames, filter, contracts, areaComs, areaComCount, stat) = await Task.Run(async () => {
+            var (filterNames, filter, contracts, areaCmts, areaCmtCount, stat) = await Task.Run(async () => {
                 using var ctx = new AppDbContext();
-                var (filterNames, contractQuery, areaComQuery, filter) = await vm.GetFilters(ctx);
+                var (filterNames, contractQuery, areaCmtQuery, filter) = await vm.GetFilters(ctx);
                 var contracts = await contractQuery
                     .Include(c => c.Revisions).ThenInclude(a => a.Member)
                     .ToListAsync();
-                var areaComs = await areaComQuery.ToListAsync();
+                var areaCmts = await areaCmtQuery.ToListAsync();
 
                 if (filter.Count > 0 && contracts.Count > 0) {
                     var dict = contracts.AsParallel()
@@ -68,11 +68,11 @@ namespace Elwig.Windows {
                     .Select(a => a.Key)];
                 }
 
-                var areaComCount = await areaComQuery.CountAsync();
+                var areaCmtCount = await areaCmtQuery.CountAsync();
                 var season = await ctx.FetchSeasons().FirstOrDefaultAsync();
-                var stat = await AreaComService.GenerateToolTipData(areaComQuery, season?.MaxKgPerHa ?? 10_000);
+                var stat = await AreaCmtService.GenerateToolTipData(areaCmtQuery, season?.MaxKgPerHa ?? 10_000);
 
-                return (filterNames, filter, contracts, areaComs, areaComCount, stat);
+                return (filterNames, filter, contracts, areaCmts, areaCmtCount, stat);
             });
             if (!cursor) Mouse.OverrideCursor = null;
             if (query != (ViewModel.SearchQuery, ViewModel.FilterSeason)) return;
@@ -83,16 +83,16 @@ namespace Elwig.Windows {
             RefreshInputs();
 
             if (filter.Count == 0) {
-                ViewModel.StatusAreaCommitments = $"{areaComCount:N0}";
+                ViewModel.StatusAreaCommitments = $"{areaCmtCount:N0}";
                 var (text, gridData) = stat;
                 ViewModel.StatusArea = text;
-                ViewModel.StatusAreaToolTip = AreaComService.GenerateToolTip(gridData);
+                ViewModel.StatusAreaToolTip = AreaCmtService.GenerateToolTip(gridData);
             } else {
                 ViewModel.StatusAreaCommitments = $"{contracts.Count:N0}";
-                ViewModel.StatusArea = $"{areaComs.Sum(a => a.Area):N0} m²";
+                ViewModel.StatusArea = $"{areaCmts.Sum(a => a.Area):N0} m²";
                 ViewModel.StatusAreaToolTip = null;
             }
-            var groups = areaComs.GroupBy(a => $"{a.AreaComType.SortId}{a.AreaComType.AttrId}").Select(a => (a.Key, a.Sum(b => b.Area))).OrderByDescending(a => a.Item2).ToList();
+            var groups = areaCmts.GroupBy(a => $"{a.AreaCmtType.SortId}{a.AreaCmtType.AttrId}").Select(a => (a.Key, a.Sum(b => b.Area))).OrderByDescending(a => a.Item2).ToList();
             ViewModel.StatusContracts = $"{groups.Count:N0}";
             if (groups.Count > 0)
                 ViewModel.StatusContracts += $" ({string.Join(", ", groups.Select(g => g.Key))})";
@@ -100,7 +100,7 @@ namespace Elwig.Windows {
 
         private async Task RefreshRevisions() {
             using var ctx = new AppDbContext();
-            if (AreaCommitmentList.SelectedItem is AreaComContract c) {
+            if (AreaCommitmentList.SelectedItem is AreaCmtContract c) {
                 ControlUtils.RenewItemsSource(RevisionList, c.Revisions.OrderByDescending(p => p.RevNr).ToList(), RevisionList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
             } else {
                 RevisionList.ItemsSource = null;
@@ -109,11 +109,11 @@ namespace Elwig.Windows {
 
         private void RefreshInputs(bool validate = false) {
             ClearInputStates();
-            if (RevisionList.SelectedItem is AreaCom a) {
+            if (RevisionList.SelectedItem is AreaCmt a) {
                 EditAreaCommitmentButton.IsEnabled = true;
                 DeleteAreaCommitmentButton.IsEnabled = true;
                 FillInputs(a);
-            } else if (AreaCommitmentList.SelectedItem is AreaComContract c) {
+            } else if (AreaCommitmentList.SelectedItem is AreaCmtContract c) {
                 EditAreaCommitmentButton.IsEnabled = true;
                 DeleteAreaCommitmentButton.IsEnabled = true;
                 FillInputs(c);
@@ -128,14 +128,14 @@ namespace Elwig.Windows {
             GC.Collect();
         }
 
-        private void FillInputs(AreaComContract c) {
+        private void FillInputs(AreaCmtContract c) {
             ClearOriginalValues();
             ClearDefaultValues();
             ViewModel.FillInputs(c);
             FinishInputFilling();
         }
 
-        private void FillInputs(AreaCom a) {
+        private void FillInputs(AreaCmt a) {
             FillInputs(a.Contract);
             ClearOriginalValues();
             ClearDefaultValues();
@@ -170,7 +170,7 @@ namespace Elwig.Windows {
                 .Select(k => k.AtKg)
                 .OrderBy(k => k.Name)
                 .ToListAsync());
-            ControlUtils.RenewItemsSource(AreaComTypeInput, await ctx.AreaCommitmentTypes
+            ControlUtils.RenewItemsSource(AreaCmtTypeInput, await ctx.AreaCommitmentTypes
                 .Include(c => c.WineVar)
                 .Include(c => c.WineAttr)
                 .OrderBy(v => v.VtrgId)
@@ -228,10 +228,10 @@ namespace Elwig.Windows {
         }
 
         private async void DeleteAreaCommitmentButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (RevisionList.SelectedItem is not AreaCom a)
+            if (RevisionList.SelectedItem is not AreaCmt a)
                 return;
 
-            var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, true, RevisionList.ItemsSource.Cast<object>().FirstOrDefault() != a);
+            var d = new AreaCmtModifyDialog(a.YearFrom, a.YearTo, a.Area, true, RevisionList.ItemsSource.Cast<object>().FirstOrDefault() != a);
             if (d.ShowDialog() != true)
                 return;
 
@@ -241,7 +241,7 @@ namespace Elwig.Windows {
                     ViewModel.YearTo = yearTo;
                     await ViewModel.UpdateAreaCommitment(a.FbNr, a.RevNr);
                 } else {
-                    await AreaComService.DeleteAreaCom(a.FbNr);
+                    await AreaCmtService.DeleteAreaCmt(a.FbNr);
                 }
                 App.HintContextChange();
             } catch (Exception exc) {
@@ -260,9 +260,9 @@ namespace Elwig.Windows {
             SaveButton.IsEnabled = false;
 
             int? yearTo = null;
-            if (InputHasChanged(AreaInput) || InputHasChanged(AreaComTypeInput) || InputHasChanged(MgNrInput)) {
+            if (InputHasChanged(AreaInput) || InputHasChanged(AreaCmtTypeInput) || InputHasChanged(MgNrInput)) {
-                var a = (RevisionList.SelectedItem as AreaCom)!;
+                var a = (RevisionList.SelectedItem as AreaCmt)!;
-                var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, false, RevisionList.ItemsSource.Cast<object>().FirstOrDefault() != a);
+                var d = new AreaCmtModifyDialog(a.YearFrom, a.YearTo, a.Area, false, RevisionList.ItemsSource.Cast<object>().FirstOrDefault() != a);
                 if (d.ShowDialog() != true) {
                     SaveButton.IsEnabled = true;
                     return;
@@ -273,13 +273,13 @@ namespace Elwig.Windows {
             int fbnr, revnr;
             Mouse.OverrideCursor = Cursors.Wait;
             try {
-                AreaCom? temp = null;
+                AreaCmt? temp = null;
                 if (yearTo != null && (!ViewModel.YearTo.HasValue || yearTo < ViewModel.YearTo)) {
-                    temp = new AreaCom {
+                    temp = new AreaCmt {
                         MgNr = ViewModel.MgNr!.Value,
                         YearFrom = ViewModel.YearFrom,
                         YearTo = ViewModel.YearTo,
-                        VtrgId = ViewModel.AreaComType!.VtrgId,
+                        VtrgId = ViewModel.AreaCmtType!.VtrgId,
                         CultId = ViewModel.WineCult?.CultId,
                         GstNr = ViewModel.GstNr?.Trim() ?? "-",
                         Area = ViewModel.Area!.Value,
@@ -287,11 +287,11 @@ namespace Elwig.Windows {
                     RefreshInputs();
                     ViewModel.YearTo = yearTo;
                 }
-                (fbnr, revnr) = await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaComContract)?.FbNr, (RevisionList.SelectedItem as AreaCom)?.RevNr);
+                (fbnr, revnr) = await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaCmtContract)?.FbNr, (RevisionList.SelectedItem as AreaCmt)?.RevNr);
-                if (temp is AreaCom t) {
+                if (temp is AreaCmt t) {
                     t.YearFrom = yearTo + 1;
                     ViewModel.FillInputs(t);
-                    (fbnr, revnr) = await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaComContract)?.FbNr, null);
+                    (fbnr, revnr) = await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaCmtContract)?.FbNr, null);
                 }
                 App.HintContextChange();
             } catch (Exception exc) {
@@ -415,7 +415,7 @@ namespace Elwig.Windows {
 
         private void RevisionList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
             RefreshInputs();
-            if (RevisionList.SelectedItem is AreaCom c) {
+            if (RevisionList.SelectedItem is AreaCmt c) {
                 EditAreaCommitmentButton.IsEnabled = true;
             } else {
                 EditAreaCommitmentButton.IsEnabled = false;
@@ -495,12 +495,12 @@ namespace Elwig.Windows {
             RdInput.SelectedIndex = s.Count();
         }
 
-        protected void InputTextChanged(TextBox input, Func<TextBox, bool, AreaComContract?, ValidationResult> checker) {
+        protected void InputTextChanged(TextBox input, Func<TextBox, bool, AreaCmtContract?, ValidationResult> checker) {
-            InputTextChanged(input, checker(input, SenderIsRequired(input), (AreaComContract)AreaCommitmentList.SelectedItem));
+            InputTextChanged(input, checker(input, SenderIsRequired(input), (AreaCmtContract)AreaCommitmentList.SelectedItem));
         }
 
-        protected void InputLostFocus(TextBox input, Func<TextBox, bool, AreaComContract?, ValidationResult> checker, string? msg = null) {
+        protected void InputLostFocus(TextBox input, Func<TextBox, bool, AreaCmtContract?, ValidationResult> checker, string? msg = null) {
-            InputLostFocus(input, checker(input, SenderIsRequired(input), (AreaComContract)AreaCommitmentList.SelectedItem), msg);
+            InputLostFocus(input, checker(input, SenderIsRequired(input), (AreaCmtContract)AreaCommitmentList.SelectedItem), msg);
         }
 
         private void FbNrInput_TextChanged(object sender, RoutedEventArgs evt) {

Elwig/Windows/BaseDataWindow.xaml

@@ -566,7 +566,7 @@
                                       Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
                         </Grid>
                     </GroupBox>
-                    <GroupBox x:Name="ParameterAreaComGroup" Header="Berechnung Flächenbindungen (aktuelle Saison)" Margin="10,10,10,0" VerticalAlignment="Top">
+                    <GroupBox x:Name="ParameterAreaCmtGroup" Header="Berechnung Flächenbindungen (aktuelle Saison)" Margin="10,10,10,0" VerticalAlignment="Top">
                         <Grid>
                             <CheckBox x:Name="ParameterAllowAttrIntoLowerInput" Content="Erlauben Lieferungen auch auf (konfigurierte) &quot;schlechtere&quot; Flächenbindungen aufzuteilen"
                                       VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,10,10,10"
@@ -574,7 +574,7 @@
                             <CheckBox x:Name="ParameterAvoidUnderDeliveriesInput" Content="Unterlieferungen durch Abzug bei &quot;besseren&quot; Flächenbindungen vermeiden"
                                       VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,30,10,10"
                                       Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
-                            <CheckBox x:Name="ParameterHonorGebundenInput" Margin="10,50,10,10" VerticalAlignment="Top"
+                            <CheckBox x:Name="ParameterHonorContractedInput" Margin="10,50,10,10" VerticalAlignment="Top"
                                       Checked="CheckBox_Changed" Unchecked="CheckBox_Changed">
                                 <TextBlock>Bei Lieferungen das Feld <Italic>Gebunden</Italic> berücksichtigen</TextBlock>
                             </CheckBox>

Elwig/Windows/BaseDataWindow.xaml.AreaCom.cs

@@ -13,8 +13,8 @@ namespace Elwig.Windows {
     public partial class BaseDataWindow {
 
         private Dictionary<string, string?>? _acts = null;
-        private Dictionary<AreaComType, string>? _actIds = null;
+        private Dictionary<AreaCmtType, string>? _actIds = null;
-        private ObservableCollection<AreaComType>? _actList = null;
+        private ObservableCollection<AreaCmtType>? _actList = null;
         private bool _actChanged = false;
         private bool _actUpdate = false;
 
@@ -73,7 +73,7 @@ namespace Elwig.Windows {
         private void AreaCommitmentTypeList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
             UpdateButtons();
             _actUpdate = true;
-            if (AreaCommitmentTypeList.SelectedItem is AreaComType type) {
+            if (AreaCommitmentTypeList.SelectedItem is AreaCmtType type) {
                 AreaCommitmentTypeIdInput.Text = $"{type.SortId}{type.AttrId}";
                 ControlUtils.SelectItemWithPk(AreaCommitmentTypeWineVariantInput, type.SortId);
                 ControlUtils.SelectItemWithPk(AreaCommitmentTypeWineAttributeInput, type.AttrId);
@@ -96,7 +96,7 @@ namespace Elwig.Windows {
         private void AreaCommitmentTypeAddButton_Click(object sender, RoutedEventArgs evt) {
             if (_actList == null) return;
             _actChanged = true;
-            var item = new AreaComType { VtrgId = "", SortId = "" };
+            var item = new AreaCmtType { VtrgId = "", SortId = "" };
             _actList.Add(item);
             AreaCommitmentTypeList.SelectedItem = item;
             UpdateButtons();
@@ -114,7 +114,7 @@ namespace Elwig.Windows {
         }
 
         private void AreaCommitmentType_Changed(object? sender, RoutedEventArgs? evt) {
-            if (_actUpdate || (!IsEditing && !IsCreating) || AreaCommitmentTypeList.SelectedItem is not AreaComType attr || _acts == null || _actIds == null) return;
+            if (_actUpdate || (!IsEditing && !IsCreating) || AreaCommitmentTypeList.SelectedItem is not AreaCmtType attr || _acts == null || _actIds == null) return;
             _actChanged = true;
 
             var v = AreaCommitmentTypeWineVariantInput.SelectedItem as WineVar;

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -37,7 +37,7 @@ namespace Elwig.Windows {
             ];
             WineAttributeFillLowerInput.Visibility = Visibility.Hidden;
             WineAttributeFillLowerLabel.Visibility = Visibility.Hidden;
-            ParameterAreaComGroup.Header = ParameterAreaComGroup.Header.ToString()!.Split('(')[0] + $"({Utils.CurrentLastSeason})";
+            ParameterAreaCmtGroup.Header = ParameterAreaCmtGroup.Header.ToString()!.Split('(')[0] + $"({Utils.CurrentLastSeason})";
             LockInputs();
         }
 
@@ -352,7 +352,7 @@ namespace Elwig.Windows {
             ParameterBusinessShareHistoryInput.IsChecked = p.EnableMemberHistory;
             ParameterAllowAttrIntoLowerInput.IsChecked = s?.Billing_AllowAttrsIntoLower ?? false;
             ParameterAvoidUnderDeliveriesInput.IsChecked = s?.Billing_AvoidUnderDeliveries ?? false;
-            ParameterHonorGebundenInput.IsChecked = s?.Billing_HonorGebunden ?? false;
+            ParameterHonorContractedInput.IsChecked = s?.Billing_HonorContracted ?? false;
             ParameterExportEbicsVersion.SelectedIndex = p.ExportEbicsVersion - 3;
             ParameterExportEbicsAddress.SelectedIndex = p.ExportEbicsAddress;
 
@@ -406,7 +406,7 @@ namespace Elwig.Windows {
 
                 s.Billing_AllowAttrsIntoLower = ParameterAllowAttrIntoLowerInput.IsChecked ?? false;
                 s.Billing_AvoidUnderDeliveries = ParameterAvoidUnderDeliveriesInput.IsChecked ?? false;
-                s.Billing_HonorGebunden = ParameterHonorGebundenInput.IsChecked ?? false;
+                s.Billing_HonorContracted = ParameterHonorContractedInput.IsChecked ?? false;
                 ctx.Update(s);
                 await ctx.SaveChangesAsync();
             } catch { }

Elwig/Windows/ChartWindow.xaml

@@ -138,9 +138,9 @@
                     <Label Content="Oechsle:" Margin="10,10,0,0" Grid.Column="0"/>
                     <ctrl:UnitTextBox x:Name="OechsleInput" Unit="°Oe" TextChanged="OechsleInput_TextChanged" IsEnabled="False"
                                       Grid.Column="1" Width="52" Margin="0,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                    <CheckBox x:Name="GebInput" Content="Geb." IsEnabled="False"
+                    <CheckBox x:Name="ContractedInput" Content="Geb." IsEnabled="False"
                               Grid.Column="1" Margin="0,15,10,0" HorizontalAlignment="Right" VerticalAlignment="Top"
-                              Checked="GebInput_Changed" Unchecked="GebInput_Changed"/>
+                              Checked="ContractedInput_Changed" Unchecked="ContractedInput_Changed"/>
 
                     <Label Content="Preis:" Margin="10,40,0,0" Grid.Column="0"/>
                     <ctrl:UnitTextBox x:Name="PriceInput" Unit="€/kg" TextChanged="PriceInput_TextChanged" IsEnabled="False"
@@ -148,16 +148,16 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Gebunden Aufschlag" Grid.Row="1" Margin="0,5,5,5">
+            <GroupBox Header="Gebunden-Aufschlag" Grid.Row="1" Margin="0,5,5,5">
                 <Grid>
 
                     <StackPanel Margin="10,10,0,0">
-                        <RadioButton x:Name="GebundenTypeFixed" GroupName="GebundenType" Checked="GebundenType_Checked" IsEnabled="False">Fix</RadioButton>
+                        <RadioButton x:Name="ContractedTypeFixed" GroupName="ContractedType" Checked="ContractedType_Checked" IsEnabled="False">Fix</RadioButton>
-                        <RadioButton x:Name="GebundenTypeGraph" GroupName="GebundenType" Checked="GebundenType_Checked" IsEnabled="False">Frei</RadioButton>
+                        <RadioButton x:Name="ContractedTypeGraph" GroupName="ContractedType" Checked="ContractedType_Checked" IsEnabled="False">Frei</RadioButton>
-                        <RadioButton x:Name="GebundenTypeNone" GroupName="GebundenType" Checked="GebundenType_Checked" IsEnabled="False">Nein</RadioButton>
+                        <RadioButton x:Name="ContractedTypeNone" GroupName="ContractedType" Checked="ContractedType_Checked" IsEnabled="False">Nein</RadioButton>
                     </StackPanel>
 
-                    <ctrl:UnitTextBox x:Name="GebundenFlatBonus" Unit="€/kg" TextChanged="GebundenFlatBonus_TextChanged" IsEnabled="False"
+                    <ctrl:UnitTextBox x:Name="ContractedFlatBonus" Unit="€/kg" TextChanged="ContractedFlatBonus_TextChanged" IsEnabled="False"
                                       Width="90" Margin="5,5,5,5" HorizontalAlignment="Right" VerticalAlignment="Top" Grid.Column="1"/>
                 </Grid>
             </GroupBox>

Elwig/Windows/ChartWindow.xaml.cs

@@ -15,8 +15,8 @@ using Elwig.Services;
 namespace Elwig.Windows {
     public partial class ChartWindow : ContextWindow {
 
-        public static readonly Color ColorUngebunden = Colors.Blue;
+        public static readonly Color ColorUnContracted = Colors.Blue;
-        public static readonly Color ColorGebunden = Colors.Gold;
+        public static readonly Color ColorContracted = Colors.Gold;
 
         public readonly int Year;
         public readonly int AvNr;
@@ -27,20 +27,20 @@ namespace Elwig.Windows {
         private bool Updating = false;
 
         private Scatter? DataPlot;
-        private Scatter? GebundenPlot;
+        private Scatter? ContractedPlot;
         private Marker? HighlightedPointPlot;
         private Marker? PrimaryMarkedPointPlot;
         private Marker? SecondaryMarkedPointPlot;
         private Text? TooltipPlot;
 
         private static readonly LegendItem
-            UngebundenLegend = new() {
+            UnContractedLegend = new() {
-                LabelText = "Ungebunden", LineWidth = 1, LineColor = ColorUngebunden,
+                LabelText = "UnContracted", LineWidth = 1, LineColor = ColorUnContracted,
-                MarkerStyle = new(MarkerShape.FilledCircle, 5, ColorUngebunden)
+                MarkerStyle = new(MarkerShape.FilledCircle, 5, ColorUnContracted)
             },
-            GebundenLegend = new() {
+            ContractedLegend = new() {
-                LabelText = "Gebunden", LineWidth = 1, LineColor = ColorGebunden,
+                LabelText = "Contracted", LineWidth = 1, LineColor = ColorContracted,
-                MarkerStyle = new(MarkerShape.FilledCircle, 5, ColorGebunden)
+                MarkerStyle = new(MarkerShape.FilledCircle, 5, ColorContracted)
             },
             LdwLegend = new() {
                 LabelText = "68 °Oe (LDW)", LineWidth = 2, LineColor = Colors.Red, MarkerStyle = MarkerStyle.None
@@ -75,7 +75,7 @@ namespace Elwig.Windows {
             Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("Season not found");
             CurrencySymbol = Season.Currency.Symbol ?? Season.Currency.Code;
             PriceInput.Unit = $"{CurrencySymbol}/kg";
-            GebundenFlatBonus.Unit = $"{CurrencySymbol}/kg";
+            ContractedFlatBonus.Unit = $"{CurrencySymbol}/kg";
             PaymentVar = ctx.PaymentVariants.Find(year, avnr) ?? throw new ArgumentException("PaymentVar not found");
             Title = $"{PaymentVar.Name} - Lese {year} - Elwig";
             LockContext = true;
@@ -100,7 +100,7 @@ namespace Elwig.Windows {
             Season = await ctx.FetchSeasons(Year).SingleOrDefaultAsync() ?? throw new ArgumentException("Season not found");
             CurrencySymbol = Season.Currency.Symbol ?? Season.Currency.Code;
             PriceInput.Unit = $"{CurrencySymbol}/kg";
-            GebundenFlatBonus.Unit = $"{CurrencySymbol}/kg";
+            ContractedFlatBonus.Unit = $"{CurrencySymbol}/kg";
 
             try {
                 var data = EditBillingData.FromJson(PaymentVar.Data, await Utils.GetVaributes(ctx, Year));
@@ -148,10 +148,10 @@ namespace Elwig.Windows {
                 CopyButton.IsEnabled = true;
                 DeleteButton.IsEnabled = true;
                 EnableTextBox(OechsleInput);
-                GebInput.IsEnabled = SelectedGraphEntry?.GebundenGraph != null;
+                ContractedInput.IsEnabled = SelectedGraphEntry?.ContractedGraph != null;
-                GebundenTypeFixed.IsEnabled = true;
+                ContractedTypeFixed.IsEnabled = true;
-                GebundenTypeGraph.IsEnabled = true;
+                ContractedTypeGraph.IsEnabled = true;
-                GebundenTypeNone.IsEnabled = true;
+                ContractedTypeNone.IsEnabled = true;
                 VaributeInput.IsEnabled = true;
                 AbgewertetInput.IsEnabled = true;
                 EnableOptionButtons();
@@ -160,7 +160,7 @@ namespace Elwig.Windows {
                 CopyButton.IsEnabled = false;
                 DeleteButton.IsEnabled = false;
                 DisableTextBox(OechsleInput);
-                GebInput.IsEnabled = false;
+                ContractedInput.IsEnabled = false;
                 DisableOptionButtons();
             }
             if (!PaymentVar.TestVariant) {
@@ -168,9 +168,9 @@ namespace Elwig.Windows {
                 CopyButton.IsEnabled = false;
                 DeleteButton.IsEnabled = false;
                 DisableTextBox(PriceInput);
-                GebundenTypeFixed.IsEnabled = false;
+                ContractedTypeFixed.IsEnabled = false;
-                GebundenTypeGraph.IsEnabled = false;
+                ContractedTypeGraph.IsEnabled = false;
-                GebundenTypeNone.IsEnabled = false;
+                ContractedTypeNone.IsEnabled = false;
                 VaributeInput.IsEnabled = false;
                 AbgewertetInput.IsEnabled = false;
             }
@@ -181,15 +181,15 @@ namespace Elwig.Windows {
             FillingInputs = true;
 
             AbgewertetInput.IsChecked = SelectedGraphEntry?.Abgewertet;
-            if (SelectedGraphEntry?.GebundenFlatBonus is double bonus) {
+            if (SelectedGraphEntry?.ContractedFlatBonus is double bonus) {
-                GebundenTypeFixed.IsChecked = true;
+                ContractedTypeFixed.IsChecked = true;
-                GebundenFlatBonus.Text = $"{bonus}";
+                ContractedFlatBonus.Text = $"{bonus}";
-            } else if (SelectedGraphEntry?.GebundenGraph != null) {
+            } else if (SelectedGraphEntry?.ContractedGraph != null) {
-                GebundenTypeGraph.IsChecked = true;
+                ContractedTypeGraph.IsChecked = true;
-                GebundenFlatBonus.Text = "";
+                ContractedFlatBonus.Text = "";
             } else {
-                GebundenTypeNone.IsChecked = true;
+                ContractedTypeNone.IsChecked = true;
-                GebundenFlatBonus.Text = "";
+                ContractedFlatBonus.Text = "";
             }
 
             ControlUtils.SelectItems(VaributeInput, SelectedGraphEntry?.Vaributes ?? []);
@@ -208,21 +208,21 @@ namespace Elwig.Windows {
         private void InitPlot() {
             RefreshGradationLines();
 
-            if (SelectedGraphEntry?.GebundenGraph != null) {
+            if (SelectedGraphEntry?.ContractedGraph != null) {
-                GebundenPlot = OechslePricePlot.Plot.Add.Scatter(SelectedGraphEntry.GebundenGraph.DataX, SelectedGraphEntry.GebundenGraph.DataY);
+                ContractedPlot = OechslePricePlot.Plot.Add.Scatter(SelectedGraphEntry.ContractedGraph.DataX, SelectedGraphEntry.ContractedGraph.DataY);
-                GebundenPlot.LineStyle.Color = ColorGebunden;
+                ContractedPlot.LineStyle.Color = ColorContracted;
-                GebundenPlot.Color = ColorGebunden;
+                ContractedPlot.Color = ColorContracted;
-                GebundenPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorGebunden);
+                ContractedPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorContracted);
             }
 
             if (SelectedGraphEntry != null) {
                 DataPlot = OechslePricePlot.Plot.Add.Scatter(SelectedGraphEntry.DataGraph.DataX, SelectedGraphEntry.DataGraph.DataY);
-                DataPlot.LineStyle.Color = ColorUngebunden;
+                DataPlot.LineStyle.Color = ColorUnContracted;
-                DataPlot.Color = ColorUngebunden;
+                DataPlot.Color = ColorUnContracted;
-                DataPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorUngebunden);
+                DataPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorUnContracted);
             }
 
-            OechslePricePlot.Plot.Axes.SetLimits(Math.Min(GraphEntry.MinX, GraphEntry.MinXGeb) - 1, GraphEntry.MaxX + 1, -0.1, 1.5);
+            OechslePricePlot.Plot.Axes.SetLimits(Math.Min(GraphEntry.MinX, GraphEntry.MinXCtrd) - 1, GraphEntry.MaxX + 1, -0.1, 1.5);
 
             HighlightedPointPlot = OechslePricePlot.Plot.Add.Marker(0, 0, MarkerShape.OpenCircle, 10, Colors.Red);
             HighlightedPointPlot.IsVisible = false;
@@ -250,9 +250,9 @@ namespace Elwig.Windows {
                 OechslePricePlot.Plot.Remove(DataPlot);
                 DataPlot = null;
             }
-            if (GebundenPlot != null) {
+            if (ContractedPlot != null) {
-                OechslePricePlot.Plot.Remove(GebundenPlot);
+                OechslePricePlot.Plot.Remove(ContractedPlot);
-                GebundenPlot = null;
+                ContractedPlot = null;
             }
             OechslePricePlot.Plot.Clear();
             OechslePricePlot.Reset();
@@ -365,8 +365,8 @@ namespace Elwig.Windows {
             OechslePricePlot.Plot.Legend.ManualItems.Add(LdwLegend);
             OechslePricePlot.Plot.Legend.ManualItems.Add(QuwLegend);
             OechslePricePlot.Plot.Legend.ManualItems.Add(KabLegend);
-            OechslePricePlot.Plot.Legend.ManualItems.Add(UngebundenLegend);
+            OechslePricePlot.Plot.Legend.ManualItems.Add(UnContractedLegend);
-            if (SelectedGraphEntry?.GebundenGraph != null) OechslePricePlot.Plot.Legend.ManualItems.Add(GebundenLegend);
+            if (SelectedGraphEntry?.ContractedGraph != null) OechslePricePlot.Plot.Legend.ManualItems.Add(ContractedLegend);
         }
 
         private void HideLegend() {
@@ -408,10 +408,10 @@ namespace Elwig.Windows {
             UpdateSelectedPoint();
         }
 
-        private void GebInput_Changed(object sender, RoutedEventArgs evt) {
+        private void ContractedInput_Changed(object sender, RoutedEventArgs evt) {
             if (Updating)
                 return;
-            var sel = GebInput.IsChecked == true ? SelectedGraphEntry?.GebundenGraph : SelectedGraphEntry?.DataGraph;
+            var sel = ContractedInput.IsChecked == true ? SelectedGraphEntry?.ContractedGraph : SelectedGraphEntry?.DataGraph;
             if (sel != ActiveGraph) ChangeActiveGraph(sel);
             UpdateSelectedPoint();
         }
@@ -424,7 +424,7 @@ namespace Elwig.Windows {
                     PrimaryMarkedPointPlot?.Location = new Coordinates(PrimaryMarkedPointPlot.Location.X, price);
                     SetHasChanged();
                     OechslePricePlot.Refresh();
-                    CheckGebundenTypeFixed();
+                    CheckContractedTypeFixed();
                 }
             }
         }
@@ -436,7 +436,7 @@ namespace Elwig.Windows {
             ActiveGraph.FlattenGraphLeft(PrimaryMarkedPoint);
             SetHasChanged();
             OechslePricePlot.Refresh();
-            CheckGebundenTypeFixed();
+            CheckContractedTypeFixed();
         }
 
         private void RightFlatButton_Click(object sender, RoutedEventArgs evt) {
@@ -446,7 +446,7 @@ namespace Elwig.Windows {
             ActiveGraph.FlattenGraphRight(PrimaryMarkedPoint);
             SetHasChanged();
             OechslePricePlot.Refresh();
-            CheckGebundenTypeFixed();
+            CheckContractedTypeFixed();
         }
 
         private void InterpolateButton_Click(object sender, RoutedEventArgs evt) {
@@ -456,7 +456,7 @@ namespace Elwig.Windows {
             ActiveGraph.InterpolateGraph(PrimaryMarkedPoint, SecondaryMarkedPoint);
             SetHasChanged();
             OechslePricePlot.Refresh();
-            CheckGebundenTypeFixed();
+            CheckContractedTypeFixed();
         }
 
         private void LinearIncreaseButton_Click(object sender, RoutedEventArgs e) { 
@@ -470,7 +470,7 @@ namespace Elwig.Windows {
             ActiveGraph.LinearIncreaseGraphToEnd(PrimaryMarkedPoint, priceIncrease.Value);
             SetHasChanged();
             OechslePricePlot.Refresh();
-            CheckGebundenTypeFixed();
+            CheckContractedTypeFixed();
         }
 
         private void OechslePricePlot_MouseDown(object sender, MouseEventArgs e) {
@@ -500,7 +500,7 @@ namespace Elwig.Windows {
                 if (Highlighted.Graph != null) {
                     Updating = true;
                     OechsleInput.Text = Highlighted.Graph.GetOechsleAt(Highlighted.Index).ToString();
-                    GebInput.IsChecked = Highlighted.Graph == SelectedGraphEntry?.GebundenGraph;
+                    ContractedInput.IsChecked = Highlighted.Graph == SelectedGraphEntry?.ContractedGraph;
                     PriceInput.Text = Math.Round(Highlighted.Graph.GetPriceAt(Highlighted.Index), Season.Precision).ToString();
                     Updating = false;
                 }
@@ -509,14 +509,14 @@ namespace Elwig.Windows {
             } else {
                 PrimaryMarkedPoint = -1;
                 SecondaryMarkedPoint = -1;
-                if (SelectedGraphEntry?.GebundenGraph != null) {
+                if (SelectedGraphEntry?.ContractedGraph != null) {
                     ChangeActiveGraph(null);
                 }
                 ChangeMarker(PrimaryMarkedPointPlot, false);
                 ChangeMarker(SecondaryMarkedPointPlot, false);
 
                 OechsleInput.Text = "";
-                GebInput.IsChecked = false;
+                ContractedInput.IsChecked = false;
                 PriceInput.Text = "";
                 DisableTextBox(PriceInput);
 
@@ -549,7 +549,7 @@ namespace Elwig.Windows {
             }
 
             var mouseOnData = MouseOnPlot(DataPlot, GetMouseCoordinates(e.GetPosition(OechslePricePlot)));
-            var mouseOnGebunden = MouseOnPlot(GebundenPlot, GetMouseCoordinates(e.GetPosition(OechslePricePlot)));
+            var mouseOnContracted = MouseOnPlot(ContractedPlot, GetMouseCoordinates(e.GetPosition(OechslePricePlot)));
 
             Highlighted = LastHighlighted;
 
@@ -560,13 +560,13 @@ namespace Elwig.Windows {
                 HoverActive = true;
                 if (SelectedGraphEntry?.DataGraph is Graph g)
                     HandleTooltip(mouseOnData.Value.X, mouseOnData.Value.Y, mouseOnData.Value.Index, g, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
-            } else if (mouseOnGebunden != null) {
+            } else if (mouseOnContracted != null) {
-                ChangeMarker(HighlightedPointPlot, true, mouseOnGebunden.Value.X, mouseOnGebunden.Value.Y);
+                ChangeMarker(HighlightedPointPlot, true, mouseOnContracted.Value.X, mouseOnContracted.Value.Y);
                 HighlightedPointPlot?.IsVisible = true;
                 HoverChanged = true ^ HoverActive;
                 HoverActive = true;
-                if (SelectedGraphEntry?.GebundenGraph is Graph g)
+                if (SelectedGraphEntry?.ContractedGraph is Graph g)
-                    HandleTooltip(mouseOnGebunden.Value.X, mouseOnGebunden.Value.Y, mouseOnGebunden.Value.Index, g, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
+                    HandleTooltip(mouseOnContracted.Value.X, mouseOnContracted.Value.Y, mouseOnContracted.Value.Index, g, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
             } else {
                 ChangeMarker(HighlightedPointPlot, false);
                 HoverChanged = false ^ HoverActive;
@@ -699,25 +699,25 @@ namespace Elwig.Windows {
         private void ChangeActiveGraph(Graph? g) {
             if (g != null && g == SelectedGraphEntry?.DataGraph) {
                 EnableTextBox(OechsleInput);
-                if (SelectedGraphEntry?.GebundenGraph != null) ChangeLineWidth(DataPlot, 4);
+                if (SelectedGraphEntry?.ContractedGraph != null) ChangeLineWidth(DataPlot, 4);
-                ChangeLineWidth(GebundenPlot, 1);
+                ChangeLineWidth(ContractedPlot, 1);
-                GebInput.IsEnabled = SelectedGraphEntry?.GebundenGraph != null;
+                ContractedInput.IsEnabled = SelectedGraphEntry?.ContractedGraph != null;
-                GebInput.IsChecked = false;
+                ContractedInput.IsChecked = false;
-            } else if (g != null && g == SelectedGraphEntry?.GebundenGraph) {
+            } else if (g != null && g == SelectedGraphEntry?.ContractedGraph) {
                 EnableTextBox(OechsleInput);
-                ChangeLineWidth(GebundenPlot, 4);
+                ChangeLineWidth(ContractedPlot, 4);
                 ChangeLineWidth(DataPlot, 1);
-                GebInput.IsEnabled = SelectedGraphEntry?.GebundenGraph != null;
+                ContractedInput.IsEnabled = SelectedGraphEntry?.ContractedGraph != null;
-                GebInput.IsChecked = true;
+                ContractedInput.IsChecked = true;
             } else {
                 DisableTextBox(OechsleInput);
                 DisableTextBox(PriceInput);
                 OechsleInput.Text = "";
-                GebInput.IsEnabled = false;
+                ContractedInput.IsEnabled = false;
-                GebInput.IsChecked = false;
+                ContractedInput.IsChecked = false;
                 PriceInput.Text = "";
                 ChangeLineWidth(DataPlot, 1);
-                ChangeLineWidth(GebundenPlot, 1);
+                ChangeLineWidth(ContractedPlot, 1);
             }
             ActiveGraph = g;
         }
@@ -730,11 +730,11 @@ namespace Elwig.Windows {
             RefreshInputs();
         }
 
-        private void GebundenFlatBonus_TextChanged(object sender, TextChangedEventArgs e) {
+        private void ContractedFlatBonus_TextChanged(object sender, TextChangedEventArgs e) {
             if (FillingInputs) return;
-            var r = Validator.CheckDecimal(GebundenFlatBonus, true, 2, Season.Precision);
+            var r = Validator.CheckDecimal(ContractedFlatBonus, true, 2, Season.Precision);
             if (r.IsValid && SelectedGraphEntry != null) {
-                SelectedGraphEntry.GebundenFlatBonus = double.Parse(GebundenFlatBonus.Text);
+                SelectedGraphEntry.ContractedFlatBonus = double.Parse(ContractedFlatBonus.Text);
                 ResetPlot();
                 InitPlot();
             }
@@ -795,37 +795,37 @@ namespace Elwig.Windows {
             GraphList.Items.Refresh();
         }
 
-        private void GebundenType_Checked(object sender, RoutedEventArgs e) {
+        private void ContractedType_Checked(object sender, RoutedEventArgs e) {
             if (FillingInputs) return;
             if (SelectedGraphEntry == null) {
-                DisableTextBox(GebundenFlatBonus);
+                DisableTextBox(ContractedFlatBonus);
                 return;
             }
-            if (GebundenTypeNone.IsChecked == true) {
+            if (ContractedTypeNone.IsChecked == true) {
-                SelectedGraphEntry.RemoveGebundenGraph();
+                SelectedGraphEntry.RemoveContractedGraph();
-                DisableTextBox(GebundenFlatBonus);
+                DisableTextBox(ContractedFlatBonus);
-            } else if (GebundenTypeFixed.IsChecked == true) {
+            } else if (ContractedTypeFixed.IsChecked == true) {
-                SelectedGraphEntry.GebundenFlatBonus = double.TryParse(GebundenFlatBonus.Text, out var val) ? val : 0.1;
+                SelectedGraphEntry.ContractedFlatBonus = double.TryParse(ContractedFlatBonus.Text, out var val) ? val : 0.1;
-                SelectedGraphEntry.AddGebundenGraph();
+                SelectedGraphEntry.AddContractedGraph();
-                EnableTextBox(GebundenFlatBonus);
+                EnableTextBox(ContractedFlatBonus);
-            } else if (GebundenTypeGraph.IsChecked == true) {
+            } else if (ContractedTypeGraph.IsChecked == true) {
-                SelectedGraphEntry.AddGebundenGraph();
+                SelectedGraphEntry.AddContractedGraph();
-                DisableTextBox(GebundenFlatBonus);
+                DisableTextBox(ContractedFlatBonus);
             }
             SetHasChanged();
             RefreshInputs();
         }
 
-        private void CheckGebundenTypeFixed() {
+        private void CheckContractedTypeFixed() {
             FillingInputs = true;
-            if (SelectedGraphEntry?.GebundenFlatBonus is double bonus) {
+            if (SelectedGraphEntry?.ContractedFlatBonus is double bonus) {
-                GebundenTypeFixed.IsChecked = true;
+                ContractedTypeFixed.IsChecked = true;
-                GebundenFlatBonus.Text = $"{bonus}";
+                ContractedFlatBonus.Text = $"{bonus}";
-                EnableTextBox(GebundenFlatBonus);
+                EnableTextBox(ContractedFlatBonus);
-            } else if (SelectedGraphEntry?.GebundenGraph != null) {
+            } else if (SelectedGraphEntry?.ContractedGraph != null) {
-                GebundenTypeGraph.IsChecked = true;
+                ContractedTypeGraph.IsChecked = true;
-                GebundenFlatBonus.Text = "";
+                ContractedFlatBonus.Text = "";
-                DisableTextBox(GebundenFlatBonus);
+                DisableTextBox(ContractedFlatBonus);
             }
             FillingInputs = false;
         }

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -682,7 +682,7 @@
                               Margin="0,70,10,10" Grid.Column="1"
                               DisplayMemberPath="Name"/>
 
-                    <CheckBox x:Name="GebundenInput" IsChecked="{Binding IsGebunden, Mode=TwoWay}"
+                    <CheckBox x:Name="ContractedInput" IsChecked="{Binding IsContracted, Mode=TwoWay}"
                               Content="Gebunden" Margin="10,105,0,0" Grid.Column="0" Grid.ColumnSpan="2" IsThreeState="True"
                               VerticalAlignment="Top" HorizontalAlignment="Left"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed" Indeterminate="CheckBox_Changed"/>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -356,11 +356,11 @@ namespace Elwig.Windows {
             }
 
             if (App.Client.IsMatzen || App.Client.IsWinzerkeller || App.Client.IsBaden || App.Client.IsWeinland) {
-                GebundenInput.IsEnabled = false;
+                ContractedInput.IsEnabled = false;
-                SetDefaultValue(GebundenInput, null);
+                SetDefaultValue(ContractedInput, null);
             } else {
-                GebundenInput.IsEnabled = true;
+                ContractedInput.IsEnabled = true;
-                UnsetDefaultValue(GebundenInput);
+                UnsetDefaultValue(ContractedInput);
             }
         }
 
@@ -376,7 +376,7 @@ namespace Elwig.Windows {
             ViewModel.IsNetWeight = App.Config.WeighingMode == WeighingMode.Net;
             ViewModel.IsHandPicked = App.Config.WeighingMode != WeighingMode.Net ? true : null;
             ViewModel.Unloading = null;
-            ViewModel.IsGebunden = null;
+            ViewModel.IsContracted = null;
             InitialDefaultInputs();
 
             //WineQualityLevelInput.IsEnabled = false;  // disable wine quality level input in Übernahme

Elwig/Windows/MailWindow.xaml

@@ -126,7 +126,7 @@
                             <RadioButton GroupName="Recipients" x:Name="RecipientsActiveMembersInput" Content="aktive Mitglieder"
                                          Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                            <RadioButton GroupName="Recipients" x:Name="RecipientsAreaComMembersInput" Content="Mitglieder mit Flächenbindung"
+                            <RadioButton GroupName="Recipients" x:Name="RecipientsAreaCmtMembersInput" Content="Mitglieder mit Flächenbindung"
                                          Margin="10,30,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
                             <RadioButton GroupName="Recipients" x:Name="RecipientsDeliveryAncmtMembersInput" Content="Mitglieder mit Anmeldung"
@@ -167,19 +167,19 @@
                                          Margin="180,225,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="MemberInput_Checked"/>
 
-                            <Label Content="Funktionär:" x:Name="MemberFunktionärLabel" Margin="10,250,0,10"/>
+                            <Label Content="Funktionär:" x:Name="MemberOfficerLabel" Margin="10,250,0,10"/>
-                            <RadioButton x:Name="MemberFunktionärYesInput" Content="Ja" GroupName="MemberFunktionär"
+                            <RadioButton x:Name="MemberOfficerYesInput" Content="Ja" GroupName="MemberOfficer"
                                          Margin="80,255,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="MemberInput_Checked"/>
-                            <RadioButton x:Name="MemberFunktionärNoInput" Content="Nein" GroupName="MemberFunktionär"
+                            <RadioButton x:Name="MemberOfficerNoInput" Content="Nein" GroupName="MemberOfficer"
                                          Margin="125,255,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="MemberInput_Checked"/>
-                            <RadioButton x:Name="MemberFunktionärIndifferentInput" Content="Egal" GroupName="MemberFunktionär"
+                            <RadioButton x:Name="MemberOfficerIndifferentInput" Content="Egal" GroupName="MemberOfficer"
                                          Margin="180,255,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="MemberInput_Checked"/>
 
-                            <Label Content="Vtrg.:" x:Name="MemberAreaComLabel" Margin="10,280,0,10"/>
+                            <Label Content="Vtrg.:" x:Name="MemberAreaCmtLabel" Margin="10,280,0,10"/>
-                            <ctrl:CheckComboBox x:Name="MemberAreaComInput" AllItemsSelectedContent="Alle Vertragsarten" Delimiter=", " DisplayMemberPath="VtrgId"
+                            <ctrl:CheckComboBox x:Name="MemberAreaCmtInput" AllItemsSelectedContent="Alle Vertragsarten" Delimiter=", " DisplayMemberPath="VtrgId"
                                                 IsSelectAllActive="True" SelectAllContent="Alle Vertragsarten"
                                                 Margin="50,280,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                                 SelectionChanged="MemberInput_SelectionChanged"/>

Elwig/Windows/MailWindow.xaml.cs

@@ -122,7 +122,7 @@ namespace Elwig.Windows {
             RecipientsActiveMembersInput.IsChecked = true;
 
             MemberOrganicIndifferentInput.IsChecked = true;
-            MemberFunktionärIndifferentInput.IsChecked = true;
+            MemberOfficerIndifferentInput.IsChecked = true;
 
             DeliveryConfirmationFooterInput.Text = App.Client.TextDeliveryConfirmation;
             CreditNoteFooterInput.Text = App.Client.TextCreditNote;
@@ -181,13 +181,13 @@ namespace Elwig.Windows {
                 MemberKgInput.SelectAll();
                 MemberKgInput.SelectionChanged += MemberInput_SelectionChanged;
             }
-            ControlUtils.RenewItemsSource(MemberAreaComInput, await ctx.AreaCommitmentTypes
+            ControlUtils.RenewItemsSource(MemberAreaCmtInput, await ctx.AreaCommitmentTypes
                 .OrderBy(a => a.VtrgId)
                 .ToListAsync(), MemberInput_SelectionChanged);
-            if (MemberAreaComInput.SelectedItems.Count == 0) {
+            if (MemberAreaCmtInput.SelectedItems.Count == 0) {
-                MemberAreaComInput.SelectionChanged -= MemberInput_SelectionChanged;
+                MemberAreaCmtInput.SelectionChanged -= MemberInput_SelectionChanged;
-                MemberAreaComInput.SelectAll();
+                MemberAreaCmtInput.SelectAll();
-                MemberAreaComInput.SelectionChanged += MemberInput_SelectionChanged;
+                MemberAreaCmtInput.SelectionChanged += MemberInput_SelectionChanged;
             }
             ControlUtils.RenewItemsSource(MemberDeliveryAncmtInput, await ctx.DeliverySchedules
                 .Where(s => s.Year == Year)
@@ -408,12 +408,12 @@ namespace Elwig.Windows {
             MemberOrganicYesInput.Visibility = vis;
             MemberOrganicNoInput.Visibility = vis;
             MemberOrganicIndifferentInput.Visibility = vis;
-            MemberFunktionärLabel.Visibility = vis;
+            MemberOfficerLabel.Visibility = vis;
-            MemberFunktionärYesInput.Visibility = vis;
+            MemberOfficerYesInput.Visibility = vis;
-            MemberFunktionärNoInput.Visibility = vis;
+            MemberOfficerNoInput.Visibility = vis;
-            MemberFunktionärIndifferentInput.Visibility = vis;
+            MemberOfficerIndifferentInput.Visibility = vis;
-            MemberAreaComInput.Visibility = RecipientsAreaComMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
+            MemberAreaCmtInput.Visibility = RecipientsAreaCmtMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
-            MemberAreaComLabel.Visibility = RecipientsAreaComMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
+            MemberAreaCmtLabel.Visibility = RecipientsAreaCmtMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
             MemberDeliveryAncmtInput.Visibility = RecipientsDeliveryAncmtMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
             MemberDeliveryAncmtLabel.Visibility = RecipientsDeliveryAncmtMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
             MemberCustomInput.Visibility = RecipientsCustomInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
@@ -459,14 +459,14 @@ namespace Elwig.Windows {
                 } else if (MemberOrganicNoInput.IsChecked == true) {
                     query = query.Where(m => !m.IsOrganic);
                 }
-                if (MemberFunktionärYesInput.IsChecked == true) {
+                if (MemberOfficerYesInput.IsChecked == true) {
-                    query = query.Where(m => m.IsFunktionär);
+                    query = query.Where(m => m.IsOfficer);
-                } else if (MemberFunktionärNoInput.IsChecked == true) {
+                } else if (MemberOfficerNoInput.IsChecked == true) {
-                    query = query.Where(m => !m.IsFunktionär);
+                    query = query.Where(m => !m.IsOfficer);
                 }
 
-                if (RecipientsAreaComMembersInput.IsChecked == true) {
+                if (RecipientsAreaCmtMembersInput.IsChecked == true) {
-                    var vtrg = MemberAreaComInput.SelectedItems.Cast<AreaComType>().Select(a => a.VtrgId).ToList();
+                    var vtrg = MemberAreaCmtInput.SelectedItems.Cast<AreaCmtType>().Select(a => a.VtrgId).ToList();
                     query = query.Where(m => m.IsActive && m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Year)).Any(c => vtrg.Contains(c.VtrgId)));
                 } else if (RecipientsDeliveryAncmtMembersInput.IsChecked == true) {
                     var dsnrs = MemberDeliveryAncmtInput.SelectedItems.Cast<DeliverySchedule>().Select(s => s.DsNr).ToList();

Elwig/Windows/MainWindow.xaml

@@ -301,12 +301,12 @@
                     <TextBlock Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2">Ungebunden:</TextBlock>
 
                     <TextBlock Grid.Row="1" Grid.Column="1" TextAlignment="Right" x:Name="SeasonStatMembersTotal">-</TextBlock>
-                    <TextBlock Grid.Row="2" Grid.Column="1" TextAlignment="Right" x:Name="SeasonStatMembersGeb">-</TextBlock>
+                    <TextBlock Grid.Row="2" Grid.Column="1" TextAlignment="Right" x:Name="SeasonStatMembersCtrd">-</TextBlock>
                     <TextBlock Grid.Row="3" Grid.Column="1" TextAlignment="Right">-</TextBlock>
 
                     <TextBlock Grid.Row="1" Grid.Column="2" TextAlignment="Right" x:Name="SeasonStatWeightTotal">-</TextBlock>
-                    <TextBlock Grid.Row="2" Grid.Column="2" TextAlignment="Right" x:Name="SeasonStatWeightGeb">-</TextBlock>
+                    <TextBlock Grid.Row="2" Grid.Column="2" TextAlignment="Right" x:Name="SeasonStatWeightCtrd">-</TextBlock>
-                    <TextBlock Grid.Row="3" Grid.Column="2" TextAlignment="Right" x:Name="SeasonStatWeightUngeb">-</TextBlock>
+                    <TextBlock Grid.Row="3" Grid.Column="2" TextAlignment="Right" x:Name="SeasonStatWeightUnCtrd">-</TextBlock>
 
                     <TextBlock Grid.Row="1" Grid.Column="3" TextAlignment="Right">-</TextBlock>
                     <TextBlock Grid.Row="2" Grid.Column="3" TextAlignment="Right" x:Name="SeasonStatArea">-</TextBlock>

Elwig/Windows/MainWindow.xaml.cs

@@ -406,26 +406,26 @@ namespace Elwig.Windows {
             BreakdownMemberVarietyButton.IsEnabled = valid;
 
             SeasonStatMembersTotal.Text = "-";
-            SeasonStatMembersGeb.Text = "-";
+            SeasonStatMembersCtrd.Text = "-";
             SeasonStatWeightTotal.Text = "-";
-            SeasonStatWeightGeb.Text = "-";
+            SeasonStatWeightCtrd.Text = "-";
-            SeasonStatWeightUngeb.Text = "-";
+            SeasonStatWeightUnCtrd.Text = "-";
             SeasonStatArea.Text = "-";
             if (valid) {
                 await Task.Run(async () => {
                     var membersTotal = await ctx.Deliveries.Where(d => d.Year == year).Select(d => d.Member).Distinct().CountAsync();
-                    var areaComs = Utils.ActiveAreaCommitments(ctx.AreaCommitments, year!.Value);
+                    var areaCmts = Utils.ActiveAreaCommitments(ctx.AreaCommitments, year!.Value);
-                    var membersGeb = await areaComs.Select(c => c.Member).Distinct().CountAsync();
+                    var membersCtrd = await areaCmts.Select(c => c.Member).Distinct().CountAsync();
                     var weightTotal = await ctx.DeliveryParts.Where(p => p.Year == year).SumAsync(p => p.Weight);
-                    var gebWeight = await ctx.DeliveryPartBuckets.Where(b => b.Year == year && b.Discr != "_").SumAsync(b => b.Value);
+                    var ctrdWeight = await ctx.DeliveryPartBuckets.Where(b => b.Year == year && b.Discr != "_").SumAsync(b => b.Value);
-                    var area = await areaComs.SumAsync(c => c.Area);
+                    var area = await areaCmts.SumAsync(c => c.Area);
                     await App.MainDispatcher.BeginInvoke(() => {
                         if (year != SeasonInput.Value) return;
                         SeasonStatMembersTotal.Text = $"{membersTotal:N0}";
-                        SeasonStatMembersGeb.Text = $"{membersGeb:N0}";
+                        SeasonStatMembersCtrd.Text = $"{membersCtrd:N0}";
                         SeasonStatWeightTotal.Text = $"{weightTotal:N0} kg";
-                        SeasonStatWeightGeb.Text = $"{gebWeight:N0} kg";
+                        SeasonStatWeightCtrd.Text = $"{ctrdWeight:N0} kg";
-                        SeasonStatWeightUngeb.Text = $"{weightTotal - gebWeight:N0} kg";
+                        SeasonStatWeightUnCtrd.Text = $"{weightTotal - ctrdWeight:N0} kg";
                         SeasonStatArea.Text = $"{area:N0} m²";
                     });
                 });
@@ -462,7 +462,7 @@ namespace Elwig.Windows {
 
                     using var ctx = new AppDbContext();
                     var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, year);
-                    var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, year);
+                    var tbl2 = await AreaCmtUnderDeliveryData.ForSeason(ctx.AreaCmtUnderDeliveryRows, year);
                     using var ods = new OdsFile(filename);
                     if (App.Client.HasRedWhite) {
                         await ods.AddTable(tbl1.Red);
@@ -524,8 +524,8 @@ namespace Elwig.Windows {
                     App.HintContextChange();
 
                     using var ctx = new AppDbContext();
-                    var tbl1 = await MemberAreaComTotalsData.ForSeason(ctx.MemberAreaComTotalsRows, year);
+                    var tbl1 = await MemberAreaCmtTotalsData.ForSeason(ctx.MemberAreaCmtTotalsRows, year);
-                    var tbl2 = await MemberAreaComsData.ForSeason(ctx.MemberAreaComsRows, year);
+                    var tbl2 = await MemberAreaCmtsData.ForSeason(ctx.MemberAreaCmtsRows, year);
                     using var ods = new OdsFile(filename);
                     await ods.AddTable(tbl1);
                     await ods.AddTable(tbl2);

Elwig/Windows/MemberAdminWindow.xaml

@@ -204,7 +204,7 @@
                         <Bold>Aktiv</Bold>: aktiv, !Aktiv (nicht-aktiv)<LineBreak/>
                         <Bold>Bio-Betrieb</Bold>: BIO, !bio (ausgenommen Bio)<LineBreak/>
                         <Bold>Buchführend</Bold>: buchf[ührend], Pauschal[iert], !buchf[ührend]<LineBreak/>
-                        <Bold>Volllieferant</Bold>: voll[lieferant], !Voll[lieferant] (nicht-Volllieferant)<LineBreak/>
+                        <Bold>Vollablieferer</Bold>: voll[ablieferer], voll[lieferant], !Voll[lieferant] (nicht-Vollablieferer)<LineBreak/>
                         <Bold>Funktionär</Bold>: Funkt[ionär], !funkt[ionär] (nicht-Funktionär)<LineBreak/>
                         <Bold>Telefon-Nr.</Bold>: z.B. +436641234, ....<LineBreak/>
                         <Bold>Kontaktdaten</Bold>: email (mind. 1 E-Mail-Adr.), telnr (mind. 1 Tel.-Nr.), !email (keine E-Mail-Adr.), !telnr (keine Tel.-Nr.)<LineBreak/>
@@ -569,7 +569,7 @@
                               Checked="OrganicInput_Changed" Unchecked="OrganicInput_Changed"
                               Grid.Column="2" HorizontalAlignment="Left" Margin="5,15,0,0" VerticalAlignment="Top"/>
 
-                    <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsChecked="{Binding IsBuchführend, Mode=TwoWay}" IsEnabled="False"
+                    <CheckBox x:Name="AccountingInput" Content="Buchführend" IsChecked="{Binding IsAccounting, Mode=TwoWay}" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                               Grid.Column="2" HorizontalAlignment="Left" Margin="5,45,0,0" VerticalAlignment="Top"/>
 
@@ -660,11 +660,11 @@
                               Checked="ActiveInput_Changed" Unchecked="ActiveInput_Changed"
                               Grid.Column="2" HorizontalAlignment="Left" Margin="0,15,0,0" VerticalAlignment="Top"/>
 
-                    <CheckBox x:Name="VollLieferantInput" Content="Volllieferant" IsChecked="{Binding IsVollLieferant, Mode=TwoWay}" IsEnabled="False"
+                    <CheckBox x:Name="FullDeliveryInput" Content="Vollablieferer" IsChecked="{Binding IsFullDelivery, Mode=TwoWay}" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                               Grid.Column="2" HorizontalAlignment="Left" Margin="0,45,0,0" VerticalAlignment="Top"/>
 
-                    <CheckBox x:Name="FunkionärInput" Content="Funktionär" IsChecked="{Binding IsFunktionär, Mode=TwoWay}" IsEnabled="False"
+                    <CheckBox x:Name="OfficerInput" Content="Funktionär" IsChecked="{Binding IsOfficer, Mode=TwoWay}" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                               Grid.Column="2" HorizontalAlignment="Left" Margin="0,75,0,0" VerticalAlignment="Top"/>
 

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -474,8 +474,8 @@ namespace Elwig.Windows {
             IsCreating = true;
             MemberList.IsEnabled = false;
             ViewModel.SelectedMember = null;
-            ViewModel.TransferPredecessorAreaComs = null;
+            ViewModel.TransferPredecessorAreaCmts = null;
-            ViewModel.CancelAreaComs = null;
+            ViewModel.CancelAreaCmts = null;
             HideNewEditDeleteButtons();
             ShowSaveResetCancelButtons();
             UnlockInputs();
@@ -495,8 +495,8 @@ namespace Elwig.Windows {
 
             IsEditing = true;
             MemberList.IsEnabled = false;
-            ViewModel.TransferPredecessorAreaComs = null;
+            ViewModel.TransferPredecessorAreaCmts = null;
-            ViewModel.CancelAreaComs = null;
+            ViewModel.CancelAreaCmts = null;
 
             HideNewEditDeleteButtons();
             ShowSaveResetCancelButtons();
@@ -517,17 +517,17 @@ namespace Elwig.Windows {
             if (ViewModel.SelectedMember is not Member m)
                 return;
 
-            int areaComs = 0, deliveries = 0, credits = 0;
+            int areaCmts = 0, deliveries = 0, credits = 0;
             using (var ctx = new AppDbContext()) {
-                areaComs = await ctx.AreaCommitments.Where(c => c.MgNr == m.MgNr).CountAsync();
+                areaCmts = await ctx.AreaCommitments.Where(c => c.MgNr == m.MgNr).CountAsync();
                 deliveries = await ctx.Deliveries.Where(d => d.MgNr == m.MgNr).CountAsync();
                 credits = await ctx.Credits.Where(c => c.MgNr == m.MgNr).CountAsync();
             }
-            var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaComs, deliveries, credits);
+            var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaCmts, deliveries, credits);
             if (d.ShowDialog() == true) {
                 Mouse.OverrideCursor = Cursors.Wait;
                 try {
-                    await MemberService.DeleteMember(m.MgNr, d.DeletePaymentData, d.DeleteDeliveries, d.DeleteAreaComs);
+                    await MemberService.DeleteMember(m.MgNr, d.DeletePaymentData, d.DeleteDeliveries, d.DeleteAreaCmts);
                     App.HintContextChange();
                 } catch (Exception exc) {
                     InteractionService.ShowDbException("Mitglied löschen", exc);
@@ -580,8 +580,8 @@ namespace Elwig.Windows {
         }
 
         private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
-            ViewModel.TransferPredecessorAreaComs = null;
+            ViewModel.TransferPredecessorAreaCmts = null;
-            ViewModel.CancelAreaComs = null;
+            ViewModel.CancelAreaCmts = null;
             if (IsEditing) {
                 RefreshInputs();
             } else if (IsCreating) {
@@ -595,8 +595,8 @@ namespace Elwig.Windows {
             IsEditing = false;
             IsCreating = false;
             MemberList.IsEnabled = true;
-            ViewModel.TransferPredecessorAreaComs = null;
+            ViewModel.TransferPredecessorAreaCmts = null;
-            ViewModel.CancelAreaComs = null;
+            ViewModel.CancelAreaCmts = null;
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
             RefreshInputs();
@@ -610,7 +610,7 @@ namespace Elwig.Windows {
         }
 
         private void AreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
-            App.FocusMemberAreaComs(ViewModel.SelectedMember!.MgNr);
+            App.FocusMemberAreaCmts(ViewModel.SelectedMember!.MgNr);
         }
 
         private void DeliveryButton_Click(object sender, RoutedEventArgs evt) {
@@ -920,10 +920,10 @@ namespace Elwig.Windows {
                 if (ViewModel.MgNr == mgnr)
                     return;
                 using var ctx = new AppDbContext();
-                var areaComs = await ctx.AreaCommitments
+                var areaCmts = await ctx.AreaCommitments
                     .Where(c => c.MgNr == mgnr && (c.YearTo == null || c.YearTo >= Utils.FollowingSeason))
                     .ToListAsync();
-                if (areaComs.Count == 0)
+                if (areaCmts.Count == 0)
                     return;
 
                 var oldMember = await ctx.FetchMembers(mgnr).SingleAsync();
@@ -931,10 +931,10 @@ namespace Elwig.Windows {
                     $"{ViewModel.Prefix}{(!string.IsNullOrWhiteSpace(ViewModel.Prefix) ? " " : "")}" +
                     $"{ViewModel.GivenName}{(!string.IsNullOrWhiteSpace(ViewModel.GivenName) ? " " : "")}" +
                     $"{ViewModel.Suffix}{(!string.IsNullOrWhiteSpace(ViewModel.Suffix) ? " " : "")}";
-                var d = new AreaComTransferDialog(oldMember.AdministrativeName, newName, areaComs.Count, areaComs.Sum(c => c.Area));
+                var d = new AreaCmtTransferDialog(oldMember.AdministrativeName, newName, areaCmts.Count, areaCmts.Sum(c => c.Area));
                 if (d.ShowDialog() != true)
                     return;
-                ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason;
+                ViewModel.TransferPredecessorAreaCmts = d.SuccessorSeason;
                 if (IsEditing)
                     SetOriginalValue(PredecessorMgNrInput, -1);  // hack to allow user to save
                 UpdateButtons();
@@ -979,13 +979,13 @@ namespace Elwig.Windows {
                 return;
             if ((IsEditing || IsCreating) && ViewModel.IsActive == false && ViewModel.MgNr is int mgnr) {
                 using var ctx = new AppDbContext();
-                var areaComs = await ctx.AreaCommitments
+                var areaCmts = await ctx.AreaCommitments
                     .Where(c => c.MgNr == mgnr && (c.YearTo == null || c.YearTo >= Utils.FollowingSeason))
                     .ToListAsync();
-                if (areaComs.Count > 0) {
+                if (areaCmts.Count > 0) {
-                    var d = new AreaComTransferDialog(m.AdministrativeName, areaComs.Count, areaComs.Sum(c => c.Area));
+                    var d = new AreaCmtTransferDialog(m.AdministrativeName, areaCmts.Count, areaCmts.Sum(c => c.Area));
                     if (d.ShowDialog() == true) {
-                        ViewModel.CancelAreaComs = d.CancelSeason;
+                        ViewModel.CancelAreaCmts = d.CancelSeason;
                     }
                 }
             }

Elwig/Windows/OriginHierarchyWindow.xaml.cs

@@ -99,9 +99,9 @@ namespace Elwig.Windows {
                 var allMembers = await ctx.Members.Where(m => m.DefaultKgNr == k.KgNr).CountAsync();
                 StatusDefaultKgs.Text += $"{activeMembers:N0} ({allMembers:N0})";
                 var year = Utils.CurrentNextSeason;
-                var activeAreaComs = await Utils.ActiveAreaCommitments(ctx.AreaCommitments.Where(c => c.Contract.KgNr == k.KgNr), year).CountAsync();
+                var activeAreaCmts = await Utils.ActiveAreaCommitments(ctx.AreaCommitments.Where(c => c.Contract.KgNr == k.KgNr), year).CountAsync();
-                var allAreaComs = await ctx.AreaCommitments.Where(c => c.Contract.KgNr == k.KgNr).CountAsync();
+                var allAreaCmts = await ctx.AreaCommitments.Where(c => c.Contract.KgNr == k.KgNr).CountAsync();
-                StatusAreaCommitments.Text += $"{activeAreaComs:N0} ({allAreaComs:N0})";
+                StatusAreaCommitments.Text += $"{activeAreaCmts:N0} ({allAreaCmts:N0})";
                 var deliveryParts = await ctx.DeliveryParts.Where(p => p.KgNr == k.KgNr).CountAsync();
                 var deliveries = await ctx.Deliveries.Where(d => d.Parts.Any(p => p.KgNr == k.KgNr)).CountAsync();
                 StatusDeliveries.Text += $"{deliveries:N0} ({deliveryParts:N0})";

Elwig/Windows/PaymentAdjustmentWindow.xaml.cs

@@ -54,9 +54,9 @@ namespace Elwig.Windows {
             var contracts = await ctx.AreaCommitmentTypes.ToDictionaryAsync(t => t.VtrgId, t => t);
 
             var (tbl1, _, _) = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, Year);
-            var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, Year);
+            var tbl2 = await AreaCmtUnderDeliveryData.ForSeason(ctx.AreaCmtUnderDeliveryRows, Year);
             var weight = tbl1.Rows.ToDictionary(r => r.MgNr, r => r.WeightTotal);
-            var areaComs = tbl2.Rows.ToDictionary(r => r.MgNr, r => r.VtrgIds.Zip(r.UnderDeliveries).ToDictionary(r => r.First, r => r.Second));
+            var areaCmts = tbl2.Rows.ToDictionary(r => r.MgNr, r => r.VtrgIds.Zip(r.UnderDeliveries).ToDictionary(r => r.First, r => r.Second));
             CustomPayments = await ctx.CustomPayments.Where(p => p.Year == Year).ToDictionaryAsync(p => p.MgNr, p => p);
 
             var history = await ctx.MemberHistory
@@ -93,7 +93,7 @@ namespace Elwig.Windows {
                         (season.PenaltyPerShareAmount * Math.Floor(m.OverUnder / season.MinKgPerShare ?? 0m) ?? 0) +
                         (m.Weight == 0 ? (-season.PenaltyNone ?? 0) + (-season.PenaltyPerShareNone * m.SharesActive ?? 0) : 0)
                         : (decimal?)null,
-                    PenaltyAc = areaComs.TryGetValue(m.MgNr, out var c) ? c.Select(r => {
+                    PenaltyAc = areaCmts.TryGetValue(m.MgNr, out var c) ? c.Select(r => {
                             var con = contracts[r.Key];
                             return (r.Value.Kg * con.PenaltyPerKg ?? 0) + (r.Value.Kg < 0 ? con.PenaltyAmount ?? 0 : 0) + (r.Value.Percent == -100 ? con.PenaltyNone ?? 0 : 0);
                         }).Sum() : (decimal?)null,

Tests/E2ETests/MemberAdminWindowTest.cs

@@ -60,7 +60,7 @@ namespace Tests.E2ETests {
             Window.FindElement(By.WpfId("UstIdNrInput")).SendKeys("ATU01234565");
             Window.FindElement(By.WpfId("LfbisNrInput")).SendKeys("0123455");
 
-            Window.FindElement(By.WpfId("BuchführendInput")).Click();
+            Window.FindElement(By.WpfId("AccountingInput")).Click();
             Window.FindElement(By.WpfId("OrganicInput")).Click();
 
             Window.FindElement(By.WpfId("BillingNameInput")).SendKeys("Neuling KG");
@@ -72,8 +72,8 @@ namespace Tests.E2ETests {
             Window.FindElement(By.WpfId("BranchInput")).SelectItem("Matzen");
             Window.FindElement(By.WpfId("DefaultKgInput")).SelectItem(3);
 
-            Window.FindElement(By.WpfId("VollLieferantInput")).Click();
+            Window.FindElement(By.WpfId("FullDeliveryInput")).Click();
-            Window.FindElement(By.WpfId("FunkionärInput")).Click();
+            Window.FindElement(By.WpfId("OfficerInput")).Click();
 
             Window.FindElement(By.WpfId("CommentInput")).SendKeys("Die lieben Mustermänner und Musterfrauen!");
             Window.FindElement(By.WpfId("ContactEmailInput")).Click();

Tests/Resources/Sql/BillingInsert.sql

@@ -60,7 +60,7 @@ INSERT INTO delivery (mgnr, year, did, date, time, zwstid, lnr) VALUES
 (101, 2021, 1, '2021-10-01', NULL, 'X', 1),
 (101, 2021, 2, '2021-10-01', NULL, 'X', 2),
 (101, 2021, 3, '2021-10-01', NULL, 'X', 3);
-INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, gebunden, net_weight, manual_weighing, spl_check, scale_terminal, weighing_data, weighing_reason) VALUES
+INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, contracted, net_weight, manual_weighing, spl_check, scale_terminal, weighing_data, weighing_reason) VALUES
 (2021, 1, 1, 'GV', 'K',  NULL, 4000, 17, 'KAB', 'WLNO', 06109, TRUE,  TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2021, 1, 2, 'GV', NULL, NULL, 4000, 16, 'QUW', 'WLNO', 06109, FALSE, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2021, 2, 1, 'GV', NULL, 'B',  4000, 15, 'QUW', 'WLNO', 06109, TRUE,  TRUE, FALSE, FALSE, NULL, NULL, NULL),

Tests/Resources/Sql/Insert.sql

@@ -66,7 +66,7 @@ INSERT INTO wb_kg (kgnr, glnr) VALUES
 (15216, 2),
 (15224, 2);
 
-INSERT INTO member (mgnr, given_name, name, zwstid, volllieferant, buchführend, country, postal_dest, address, default_kgnr, iban, lfbis_nr, ustid_nr, org_auth_code) VALUES
+INSERT INTO member (mgnr, given_name, name, zwstid, full_delivery, accounting, country, postal_dest, address, default_kgnr, iban, lfbis_nr, ustid_nr, org_auth_code) VALUES
 (101, 'Max',       'Mustermann',  'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 1',    06109, 'AT811234567890123457', '0123463',         NULL ,        NULL ),
 (102, 'Wernhardt', 'Weinbauer',   'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 2',    06109, 'AT541234567890123458', '0123471', 'ATU12345684',        NULL ),
 (103, 'Matthäus',  'Musterbauer', 'X', FALSE, FALSE, 40, 212005138, 'Brünner Straße 10', 15224, 'AT271234567890123459', '0123480',         NULL , 'AT-BIO-302'),

Tests/Resources/Sql/ServiceInsert.sql

@@ -6,7 +6,7 @@ INSERT INTO wine_cultivation (cultid, name, description, organic) VALUES
 INSERT INTO wine_attribute (attrid, name, active, max_kg_per_ha, strict, fill_lower) VALUES
 ('K', 'Kabinett',  TRUE, NULL, FALSE, 0);
 
-INSERT INTO member (mgnr, given_name, name, zwstid, volllieferant, buchführend, country, postal_dest, address, default_kgnr, iban, lfbis_nr, ustid_nr) VALUES
+INSERT INTO member (mgnr, given_name, name, zwstid, full_delivery, accounting, country, postal_dest, address, default_kgnr, iban, lfbis_nr, ustid_nr) VALUES
 (201, 'Theodor', 'Testbauer',  'X', FALSE, FALSE, 40, 222303524, 'Teststraße 1', 06109, 'AT811234567890123457', '0123463',         NULL ),
 (202, 'Thomas',  'Testmann',   'X', FALSE, FALSE, 40, 222303524, 'Teststraße 2', 06109, 'AT541234567890123458', '0123471', 'ATU12345684'),
 (203, 'Tina',    'Testwinzer', 'X', FALSE, FALSE, 40, 212005138, 'Teststraße 3', 15224, 'AT271234567890123459', '0123480',         NULL ),

Tests/UnitTests/HelperTests/BillingDataTest.cs

@@ -27,17 +27,17 @@ namespace Tests.UnitTests.HelperTests {
             };
         }
 
-        private static void TestCalcOe(PaymentBillingData data, string bucket, double oe, decimal expected, string? qualid = null, bool geb = false) {
+        private static void TestCalcOe(PaymentBillingData data, string bucket, double oe, decimal expected, string? qualid = null, bool ctrd = false) {
             var (sortid, attrid, cultid) = GetSortIdAttrId(bucket);
             var kmw = Utils.OeToKmw(oe);
-            var v = data.CalculatePrice(sortid, attrid, cultid, qualid ?? GetQualId(kmw), geb, oe, kmw);
+            var v = data.CalculatePrice(sortid, attrid, cultid, qualid ?? GetQualId(kmw), ctrd, oe, kmw);
             Assert.That(Math.Round(v, 6), Is.EqualTo(expected));
         }
 
-        private static void TestCalcKmw(PaymentBillingData data, string bucket, double kmw, decimal expected, string? qualid = null, bool geb = false) {
+        private static void TestCalcKmw(PaymentBillingData data, string bucket, double kmw, decimal expected, string? qualid = null, bool ctrd = false) {
             var (sortid, attrid, cultid) = GetSortIdAttrId(bucket);
             var oe = Utils.KmwToOe(kmw);
-            var v = data.CalculatePrice(sortid, attrid, cultid, qualid ?? GetQualId(kmw), geb, oe, kmw);
+            var v = data.CalculatePrice(sortid, attrid, cultid, qualid ?? GetQualId(kmw), ctrd, oe, kmw);
             Assert.That(Math.Round(v, 6), Is.EqualTo(expected));
         }
 
@@ -84,11 +84,11 @@ namespace Tests.UnitTests.HelperTests {
                 TestCalcOe(data, "GV", 80, 0.85m);
                 TestCalcOe(data, "GV", 83, 1.00m);
                 TestCalcOe(data, "GV", 90, 1.00m);
-                TestCalcOe(data, "GV", 73, 0.60m, geb: true);
+                TestCalcOe(data, "GV", 73, 0.60m, ctrd: true);
-                TestCalcOe(data, "GV", 74, 0.65m, geb: true);
+                TestCalcOe(data, "GV", 74, 0.65m, ctrd: true);
-                TestCalcOe(data, "GV", 80, 0.95m, geb: true);
+                TestCalcOe(data, "GV", 80, 0.95m, ctrd: true);
-                TestCalcOe(data, "GV", 83, 1.10m, geb: true);
+                TestCalcOe(data, "GV", 83, 1.10m, ctrd: true);
-                TestCalcOe(data, "GV", 90, 1.10m, geb: true);
+                TestCalcOe(data, "GV", 90, 1.10m, ctrd: true);
             }
         }
 
@@ -298,7 +298,7 @@ namespace Tests.UnitTests.HelperTests {
                       "73oe": 0.5,
                       "17kmw": 0.6
                     },
-                    "geb": 0.1
+                    "contracted": 0.1
                   }, {
                     "id": 2,
                     "mode": "kmw",
@@ -306,7 +306,7 @@ namespace Tests.UnitTests.HelperTests {
                       "15kmw": 0.6,
                       "17kmw": 0.7
                     },
-                    "geb": {
+                    "contracted": {
                       "73oe": 0.65,
                       "17kmw": 0.80
                     }
@@ -318,21 +318,21 @@ namespace Tests.UnitTests.HelperTests {
                 TestCalcKmw(data, "GVS", 15.0, 0.50m);
                 TestCalcKmw(data, "GVS", 16.0, 0.55m);
                 TestCalcKmw(data, "GVS", 17.0, 0.60m);
-                TestCalcKmw(data, "GVS", 15.0, 0.60m, geb: true);
+                TestCalcKmw(data, "GVS", 15.0, 0.60m, ctrd: true);
-                TestCalcKmw(data, "GVS", 16.0, 0.65m, geb: true);
+                TestCalcKmw(data, "GVS", 16.0, 0.65m, ctrd: true);
-                TestCalcKmw(data, "GVS", 17.0, 0.70m, geb: true);
+                TestCalcKmw(data, "GVS", 17.0, 0.70m, ctrd: true);
                 TestCalcKmw(data, "GVK", 15.0, 0.60m);
                 TestCalcKmw(data, "GVK", 16.0, 0.65m);
                 TestCalcKmw(data, "GVK", 17.0, 0.70m);
-                TestCalcKmw(data, "GVK", 15.0, 0.65m, geb: true);
+                TestCalcKmw(data, "GVK", 15.0, 0.65m, ctrd: true);
-                TestCalcKmw(data, "GVK", 16.0, 0.725m, geb: true);
+                TestCalcKmw(data, "GVK", 16.0, 0.725m, ctrd: true);
-                TestCalcKmw(data, "GVK", 17.0, 0.80m, geb: true);
+                TestCalcKmw(data, "GVK", 17.0, 0.80m, ctrd: true);
                 TestCalcKmw(data, "WRS", 15.0, 0.70m);
                 TestCalcKmw(data, "WRS", 16.0, 0.75m);
                 TestCalcKmw(data, "WRS", 17.0, 0.80m);
-                TestCalcKmw(data, "WRS", 15.0, 0.80m, geb: true);
+                TestCalcKmw(data, "WRS", 15.0, 0.80m, ctrd: true);
-                TestCalcKmw(data, "WRS", 16.0, 0.875m, geb: true);
+                TestCalcKmw(data, "WRS", 16.0, 0.875m, ctrd: true);
-                TestCalcKmw(data, "WRS", 17.0, 0.95m, geb: true);
+                TestCalcKmw(data, "WRS", 17.0, 0.95m, ctrd: true);
             }
         }
 

Tests/UnitTests/HelperTests/BillingTest.cs

@@ -11,12 +11,12 @@ namespace Tests.UnitTests.HelperTests {
         private const int MgNr1 = 101, MgNr2 = 102, MgNr3 = 103, MgNr4 = 104;
 
         private const decimal
-            GV_ungeb  = 0.50m,
+            GV_unctrd  = 0.50m,
-            GV_geb    = 0.60m,
+            GV_ctrd    = 0.60m,
-            GVB_ungeb = 0.54m,
+            GVB_unctrd = 0.54m,
-            GVB_geb   = 0.64m,
+            GVB_ctrd   = 0.64m,
-            GVK_ungeb = 0.61m,
+            GVK_unctrd = 0.61m,
-            GVK_geb   = 0.71m,
+            GVK_ctrd   = 0.71m,
             WEI       = 0.10m;
 
         private SqliteConnection? Connection;
@@ -56,12 +56,12 @@ namespace Tests.UnitTests.HelperTests {
                     "id": 1,
                     "mode": "oe",
                     "data": {"15kmw": 0.54},
-                    "geb": 0.1
+                    "contracted": 0.1
                   }, {
                     "id": 2,
                     "mode": "oe",
                     "data": {"15kmw": 0.61},
-                    "geb": 0.1
+                    "contracted": 0.1
                   }]
                 }
                 """;
@@ -79,7 +79,7 @@ namespace Tests.UnitTests.HelperTests {
                 """);
         }
 
-        private Task<Dictionary<string, AreaComBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr) {
+        private Task<Dictionary<string, AreaCmtBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr) {
             using var ctx = new AppDbContext();
             return ctx.GetMemberAreaCommitmentBuckets(year, mgnr, Connection);
         }
@@ -122,11 +122,11 @@ namespace Tests.UnitTests.HelperTests {
         }
 
         [Test]
-        public async Task Test_01_NoActiveAreaComs() {
+        public async Task Test_01_NoActiveAreaCmts() {
             int mgnr = MgNr1, year = Year1;
 
-            var areaCom = await GetMemberAreaCommitmentBuckets(year, mgnr);
+            var areaCmt = await GetMemberAreaCommitmentBuckets(year, mgnr);
-            Assert.That(areaCom, Is.Empty);
+            Assert.That(areaCmt, Is.Empty);
             var delivery = await GetMemberDeliveryBuckets(year, mgnr);
             using (Assert.EnterMultipleScope()) {
                 Assert.That(delivery, Has.Count.EqualTo(3));
@@ -148,28 +148,28 @@ namespace Tests.UnitTests.HelperTests {
             using (Assert.EnterMultipleScope()) {
                 Assert.That(prices, Has.Count.EqualTo(6));
                 // Kabinett
-                Assert.That(prices[("20201001X001/1", "GV_")], Is.EqualTo((4_000, GV_ungeb)));
+                Assert.That(prices[("20201001X001/1", "GV_")], Is.EqualTo((4_000, GV_unctrd)));
                 // ohne Attribut
-                Assert.That(prices[("20201001X001/2", "GV_")], Is.EqualTo((4_000, GV_ungeb)));
+                Assert.That(prices[("20201001X001/2", "GV_")], Is.EqualTo((4_000, GV_unctrd)));
                 // Bio
-                Assert.That(prices[("20201001X002/1", "GV_")], Is.EqualTo((4_000, GVB_ungeb)));
+                Assert.That(prices[("20201001X002/1", "GV_")], Is.EqualTo((4_000, GVB_unctrd)));
                 // Bio
-                Assert.That(prices[("20201001X002/2", "GV_")], Is.EqualTo((4_000, GVB_ungeb)));
+                Assert.That(prices[("20201001X002/2", "GV_")], Is.EqualTo((4_000, GVB_unctrd)));
                 // ohne Attribut
                 Assert.That(prices[("20201001X003/1", "GV_")], Is.EqualTo((  500, WEI)));
                 // ohne Attribut
-                Assert.That(prices[("20201001X003/2", "GV_")], Is.EqualTo((  500, GV_ungeb)));
+                Assert.That(prices[("20201001X003/2", "GV_")], Is.EqualTo((  500, GV_unctrd)));
             }
         }
 
         [Test]
-        public async Task Test_02_SimpleNotStrictAreaComs() {
+        public async Task Test_02_SimpleNotStrictAreaCmts() {
             int mgnr = MgNr1, year = Year2;
 
-            var areaCom = await GetMemberAreaCommitmentBuckets(year, mgnr);
+            var areaCmt = await GetMemberAreaCommitmentBuckets(year, mgnr);
             using (Assert.EnterMultipleScope()) {
-                Assert.That(areaCom, Has.Count.EqualTo(1));
+                Assert.That(areaCmt, Has.Count.EqualTo(1));
-                Assert.That(areaCom["GV"], Is.EqualTo(new AreaComBucket(10_000, 5_000, 10_000)));
+                Assert.That(areaCmt["GV"], Is.EqualTo(new AreaCmtBucket(10_000, 5_000, 10_000)));
             }
             var delivery = await GetMemberDeliveryBuckets(year, mgnr);
             using (Assert.EnterMultipleScope()) {
@@ -193,29 +193,29 @@ namespace Tests.UnitTests.HelperTests {
             using (Assert.EnterMultipleScope()) {
                 Assert.That(prices, Has.Count.EqualTo(7));
                 // Kabinett
-                Assert.That(prices[("20211001X001/1", "GV")] , Is.EqualTo((4_000, GV_geb)));
+                Assert.That(prices[("20211001X001/1", "GV")] , Is.EqualTo((4_000, GV_ctrd)));
                 // ohne Attribut
-                Assert.That(prices[("20211001X001/2", "GV")],  Is.EqualTo((4_000, GV_geb)));
+                Assert.That(prices[("20211001X001/2", "GV")],  Is.EqualTo((4_000, GV_ctrd)));
                 // Bio
-                Assert.That(prices[("20211001X002/1", "GV_")], Is.EqualTo((4_000, GVB_ungeb)));
+                Assert.That(prices[("20211001X002/1", "GV_")], Is.EqualTo((4_000, GVB_unctrd)));
                 // Bio
-                Assert.That(prices[("20211001X002/2", "GV_")], Is.EqualTo((2_000, GVB_ungeb)));
+                Assert.That(prices[("20211001X002/2", "GV_")], Is.EqualTo((2_000, GVB_unctrd)));
-                Assert.That(prices[("20211001X002/2", "GV")],  Is.EqualTo((2_000, GVB_geb)));
+                Assert.That(prices[("20211001X002/2", "GV")],  Is.EqualTo((2_000, GVB_ctrd)));
                 // ohne Attribut
                 Assert.That(prices[("20211001X003/1", "GV_")], Is.EqualTo((  500, WEI)));
                 // ohne Attribut
-                Assert.That(prices[("20211001X003/2", "GV_")], Is.EqualTo((  500, GV_ungeb)));
+                Assert.That(prices[("20211001X003/2", "GV_")], Is.EqualTo((  500, GV_unctrd)));
             }
         }
 
         [Test]
-        public async Task Test_03_SimpleNotStrictAreaComs_HonorGebunden() {
+        public async Task Test_03_SimpleNotStrictAreaCmts_HonorContracted() {
             int mgnr = MgNr1, year = Year2;
 
-            var areaCom = await GetMemberAreaCommitmentBuckets(year, mgnr);
+            var areaCmt = await GetMemberAreaCommitmentBuckets(year, mgnr);
             using (Assert.EnterMultipleScope()) {
-                Assert.That(areaCom, Has.Count.EqualTo(1));
+                Assert.That(areaCmt, Has.Count.EqualTo(1));
-                Assert.That(areaCom["GV"], Is.EqualTo(new AreaComBucket(10_000, 5_000, 10_000)));
+                Assert.That(areaCmt["GV"], Is.EqualTo(new AreaCmtBucket(10_000, 5_000, 10_000)));
             }
             var delivery = await GetMemberDeliveryBuckets(year, mgnr);
             using (Assert.EnterMultipleScope()) {
@@ -239,72 +239,72 @@ namespace Tests.UnitTests.HelperTests {
             using (Assert.EnterMultipleScope()) {
                 Assert.That(prices, Has.Count.EqualTo(6));
                 // Kabinett
-                Assert.That(prices[("20211001X001/1", "GV")],  Is.EqualTo((4_000, GV_geb)));
+                Assert.That(prices[("20211001X001/1", "GV")],  Is.EqualTo((4_000, GV_ctrd)));
                 // ohne Attribut
-                Assert.That(prices[("20211001X001/2", "GV_")], Is.EqualTo((4_000, GV_ungeb)));
+                Assert.That(prices[("20211001X001/2", "GV_")], Is.EqualTo((4_000, GV_unctrd)));
                 // Bio
-                Assert.That(prices[("20211001X002/1", "GV")],  Is.EqualTo((4_000, GVB_geb)));
+                Assert.That(prices[("20211001X002/1", "GV")],  Is.EqualTo((4_000, GVB_ctrd)));
                 // Bio
-                Assert.That(prices[("20211001X002/2", "GV_")], Is.EqualTo((4_000, GVB_ungeb)));
+                Assert.That(prices[("20211001X002/2", "GV_")], Is.EqualTo((4_000, GVB_unctrd)));
                 // ohne Attribut
                 Assert.That(prices[("20211001X003/1", "GV_")], Is.EqualTo((  500, WEI)));
                 // ohne Attribut
-                Assert.That(prices[("20211001X003/2", "GV_")], Is.EqualTo((  500, GV_ungeb)));
+                Assert.That(prices[("20211001X003/2", "GV_")], Is.EqualTo((  500, GV_unctrd)));
             }
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_04_ComplexNotStrictAreaComs() {
+        public Task Test_04_ComplexNotStrictAreaCmts() {
             // TODO
             return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_05_ComplexNotStrictAreaComs_HonorGebunden() {
+        public Task Test_05_ComplexNotStrictAreaCmts_HonorContracted() {
             // TODO
             return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_06_StrictAreaComs_NoFillLower_NotAllowed() {
+        public Task Test_06_StrictAreaCmts_NoFillLower_NotAllowed() {
             // TODO
             return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_07_StrictAreaComs_NoFillLower_Allowed() {
+        public Task Test_07_StrictAreaCmts_NoFillLower_Allowed() {
             // TODO
             return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_08_StrictAreaComs_NoFillLower_Allowed_AvoidUnderDeliveries() {
+        public Task Test_08_StrictAreaCmts_NoFillLower_Allowed_AvoidUnderDeliveries() {
             // TODO
             return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_09_StrictAreaComs_FillLowerUntilObligation_NotAllowed() {
+        public Task Test_09_StrictAreaCmts_FillLowerUntilObligation_NotAllowed() {
             // TODO
             return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_10_StrictAreaComs_FillLowerUntilObligation_Allowed() {
+        public Task Test_10_StrictAreaCmts_FillLowerUntilObligation_Allowed() {
             // TODO
             return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_11_StrictAreaComs_FillLowerUntilObligation_Allowed_AvoidUnderDeliveries() {
+        public Task Test_11_StrictAreaCmts_FillLowerUntilObligation_Allowed_AvoidUnderDeliveries() {
             // TODO
             return Task.CompletedTask;
         }
@@ -312,42 +312,42 @@ namespace Tests.UnitTests.HelperTests {
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_12_StrictAreaComs_FillLowerUntilObligation_NotAllowed() {
+        public Task Test_12_StrictAreaCmts_FillLowerUntilObligation_NotAllowed() {
             // TODO
             return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_13_StrictAreaComs_FillLowerUntilObligation_Allowed() {
+        public Task Test_13_StrictAreaCmts_FillLowerUntilObligation_Allowed() {
             // TODO
             return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_14_StrictAreaComs_FillLowerUntilObligation_Allowed_AvoidUnderDeliveries() {
+        public Task Test_14_StrictAreaCmts_FillLowerUntilObligation_Allowed_AvoidUnderDeliveries() {
             // TODO
             return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_15_StrictAreaComs_FillLowerUntilRight_NotAllowed() {
+        public Task Test_15_StrictAreaCmts_FillLowerUntilRight_NotAllowed() {
             // TODO
             return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_16_StrictAreaComs_FillLowerUntilRight_Allowed() {
+        public Task Test_16_StrictAreaCmts_FillLowerUntilRight_Allowed() {
             // TODO
             return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public Task Test_17_StrictAreaComs_FillLowerUntilRight_Allowed_AvoidUnderDeliveries() {
+        public Task Test_17_StrictAreaCmts_FillLowerUntilRight_Allowed_AvoidUnderDeliveries() {
             // TODO
             return Task.CompletedTask;
         }

Tests/UnitTests/ServiceTests/MemberServiceTest.cs

@@ -93,7 +93,7 @@ namespace Tests.UnitTests.ServiceTests {
 
             vm.UstIdNr = "ATU12345693";
             vm.LfbisNr = "0123498";
-            vm.IsBuchführend = true;
+            vm.IsAccounting = true;
             vm.IsOrganic = true;
 
             vm.BillingName = "Neue Holding AG";
@@ -107,8 +107,8 @@ namespace Tests.UnitTests.ServiceTests {
             vm.Comment = "Ich bin eine Anmerkung";
             vm.ContactViaPost = true;
             vm.ContactViaEmail = true;
-            vm.IsVollLieferant = true;
+            vm.IsFullDelivery = true;
-            vm.IsFunktionär = true;
+            vm.IsOfficer = true;
 
             using (var ctx = new AppDbContext()) {
                 Assert.That(await ctx.FetchMembers(999).SingleOrDefaultAsync(), Is.Null);
@@ -146,7 +146,7 @@ namespace Tests.UnitTests.ServiceTests {
 
                 Assert.That(m.UstIdNr, Is.EqualTo("ATU12345693"));
                 Assert.That(m.LfbisNr, Is.EqualTo("0123498"));
-                Assert.That(m.IsBuchführend, Is.True);
+                Assert.That(m.IsAccounting, Is.True);
                 Assert.That(m.IsOrganic, Is.True);
 
                 Assert.That(m.BillingAddress, Is.Not.Null);
@@ -161,8 +161,8 @@ namespace Tests.UnitTests.ServiceTests {
                 Assert.That(m.Comment, Is.EqualTo("Ich bin eine Anmerkung"));
                 Assert.That(m.ContactViaPost, Is.True);
                 Assert.That(m.ContactViaEmail, Is.True);
-                Assert.That(m.IsVollLieferant, Is.True);
+                Assert.That(m.IsFullDelivery, Is.True);
-                Assert.That(m.IsFunktionär, Is.True);
+                Assert.That(m.IsOfficer, Is.True);
             }
 
             vm = new MemberAdminViewModel();
@@ -194,7 +194,7 @@ namespace Tests.UnitTests.ServiceTests {
 
                 Assert.That(vm.UstIdNr, Is.EqualTo("ATU12345693"));
                 Assert.That(vm.LfbisNr, Is.EqualTo("0123498"));
-                Assert.That(vm.IsBuchführend, Is.True);
+                Assert.That(vm.IsAccounting, Is.True);
                 Assert.That(vm.IsOrganic, Is.True);
 
                 Assert.That(vm.BillingName, Is.EqualTo("Neue Holding AG"));
@@ -208,8 +208,8 @@ namespace Tests.UnitTests.ServiceTests {
                 Assert.That(vm.Comment, Is.EqualTo("Ich bin eine Anmerkung"));
                 Assert.That(vm.ContactViaPost, Is.True);
                 Assert.That(vm.ContactViaEmail, Is.True);
-                Assert.That(vm.IsVollLieferant, Is.True);
+                Assert.That(vm.IsFullDelivery, Is.True);
-                Assert.That(vm.IsFunktionär, Is.True);
+                Assert.That(vm.IsOfficer, Is.True);
             }
         }