From 1eddf110e80010c594cbc1dbbcea6a9b0d5918ad Mon Sep 17 00:00:00 2001 From: Piotr Dudek Date: Tue, 4 Jun 2024 09:44:18 +0200 Subject: [PATCH] MP, MW fixes --- FKGees/DocsDefinitions/Decrets/MmMinus.cs | 8 ++++---- FKGees/DocsDefinitions/Decrets/MmPlus.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FKGees/DocsDefinitions/Decrets/MmMinus.cs b/FKGees/DocsDefinitions/Decrets/MmMinus.cs index 97438b8..64d5873 100644 --- a/FKGees/DocsDefinitions/Decrets/MmMinus.cs +++ b/FKGees/DocsDefinitions/Decrets/MmMinus.cs @@ -42,10 +42,10 @@ public class MmMinus : IDecretsDefinition { return expression switch { - "[znr]" => doc.NettoMag, - "[snr]-[znr]" => doc.Netto - doc.NettoMag, - "[sbr]-[snr]" => doc.Podatek, - "[sbr]" => doc.Netto + doc.Podatek, + "[znr]" => -(doc.NettoMag), + "[snr]-[znr]" => -(doc.NettoDet - doc.Netto), + "[sbr]-[snr]" => -(doc.Podatek), + "[sbr]" => -(doc.NettoDet + doc.PodatekDet), _ => 0 }; } diff --git a/FKGees/DocsDefinitions/Decrets/MmPlus.cs b/FKGees/DocsDefinitions/Decrets/MmPlus.cs index cbddedb..ee656ec 100644 --- a/FKGees/DocsDefinitions/Decrets/MmPlus.cs +++ b/FKGees/DocsDefinitions/Decrets/MmPlus.cs @@ -44,7 +44,7 @@ public class MmPlus : IDecretsDefinition { "[znr]" => doc.Netto, "[snr]-[znr]" => doc.NettoDet - doc.Netto, - "[sbr]-[snr]" => doc.Podatek, + "[sbr]-[snr]" => doc.PodatekDet, "[sbr]" => doc.NettoDet + doc.PodatekDet, _ => 0 };