diff --git a/Elwig/Documents/CreditNote.cshtml b/Elwig/Documents/CreditNote.cshtml
index 7723ee6..0c23ab0 100644
--- a/Elwig/Documents/CreditNote.cshtml
+++ b/Elwig/Documents/CreditNote.cshtml
@@ -125,7 +125,7 @@
totalLine = true;
} else {
var hasPrev = Model.Credit.PrevNetAmount != null;
-
+
|
@(hasPrev ? "Gesamtbetrag" : "Nettobetrag"): |
|
@@ -136,28 +136,28 @@
totalLine = true;
if (hasPrev) {
-
+
|
- Bereits berücksichtigt: |
- – |
-
+ | Bisher ausgezahlt: |
+ – |
+
@Model.CurrencySymbol
@($"{Model.Credit.PrevNetAmount:N2}")
|
-
+
|
Nettobetrag: |
|
@Model.CurrencySymbol
- @($"{Model.Credit.NetAmount:N2}")
+ @($"{Model.Credit.NetAmount - (Model.Credit.PrevNetAmount ?? 0):N2}")
|
}
|
- Mehrwertsteuer (@($"{Model.Credit.Vat * 100:N0} %")): |
+ Mehrwertsteuer (@($"{Model.Credit.Vat * 100} %")): |
+ |
@Model.CurrencySymbol
diff --git a/Elwig/Helpers/Billing/BillingVariant.cs b/Elwig/Helpers/Billing/BillingVariant.cs
index 8abddfa..c4e6797 100644
--- a/Elwig/Helpers/Billing/BillingVariant.cs
+++ b/Elwig/Helpers/Billing/BillingVariant.cs
@@ -151,6 +151,7 @@ namespace Elwig.Helpers.Billing {
var inserts = new List<(int Year, int DId, int DPNr, int BktNr, long Price, long Amount)>();
foreach (var part in parts) {
var price = !part.MinQuw ? 0.5m : ((part.BktNr == 2 ? 0.8m : (part.BktNr == 1 ? 0.7m : 0.6m)) + ((decimal)(part.Oe - 73) * 0.005m)); // TODO
+ price += (AvNr - 1) * 0.2m;
var priceL = Utils.DecToDb(price, 4);
var amount = Utils.DecToDb(price * part.Value, 4);
inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, amount));
|