diff --git a/FKGees/DocsDefinitions/Decrets/Rozb.cs b/FKGees/DocsDefinitions/Decrets/Rozb.cs index b9904c2..44b7568 100644 --- a/FKGees/DocsDefinitions/Decrets/Rozb.cs +++ b/FKGees/DocsDefinitions/Decrets/Rozb.cs @@ -11,7 +11,7 @@ public class Rozb : IDecretsDefinition new Definition("301-0-24", "WN", "[znr]"), new Definition("221-0-24", "WN", "[zvr]"), new Definition("210-1", "MA", "[zbr]"), - new Definition("301-0-24", "MA", "[zbr]"), + new Definition("301-0-24", "MA", "[znr]"), new Definition("332-0-24", "WN", "[sbr]"), new Definition("343-0-24", "MA", "[svr]"), new Definition("342-0-24", "MA", "[sbr]-[znr]"), @@ -58,17 +58,17 @@ public class Rozb : IDecretsDefinition switch (expression) { case "[znr]": - return Math.Abs(doc.Netto); + return -doc.Netto; case "[zvr]": - return Math.Abs(doc.Podatek); + return -doc.Podatek; case "[zbr]": - return Math.Abs(doc.Netto + doc.Podatek); + return -(doc.Netto + doc.Podatek); case "[sbr]": - return Math.Abs(doc.Razem); + return doc.NettoDet + doc.PodatekDet; case "[svr]": - return Math.Abs(doc.Netto - doc.NettoDet); + return doc.PodatekDet; case "[sbr]-[snr]": - return Math.Abs(doc.Razem - doc.Netto); + return doc.NettoDet + doc.PodatekDet - doc.Netto; } return 0; diff --git a/FKGees/DocsDefinitions/Decrets/Zwroty.cs b/FKGees/DocsDefinitions/Decrets/Zwroty.cs index 11e3fca..593de7a 100644 --- a/FKGees/DocsDefinitions/Decrets/Zwroty.cs +++ b/FKGees/DocsDefinitions/Decrets/Zwroty.cs @@ -11,7 +11,7 @@ public class Zwroty : IDecretsDefinition new Definition("301-0-24", "WN", "[znr]"), new Definition("221-0-24", "WN", "[zvr]"), new Definition("210-1", "MA", "[zbr]"), - new Definition("301-0-24", "MA", "[zbr]"), + new Definition("301-0-24", "MA", "[znr]"), new Definition("332-0-24", "WN", "[sbr]"), new Definition("343-0-24", "MA", "[svr]"), new Definition("342-0-24", "MA", "[sbr]-[znr]") @@ -58,17 +58,17 @@ public class Zwroty : IDecretsDefinition switch (expression) { case "[znr]": - return Math.Abs(doc.Netto); + return -doc.Netto; case "[zvr]": - return Math.Abs(doc.Podatek); + return -doc.Podatek; case "[zbr]": - return Math.Abs(doc.Netto + doc.Podatek); + return -(doc.Netto + doc.Podatek); case "[sbr]": - return Math.Abs(doc.Razem); + return doc.NettoDet + doc.PodatekDet; case "[svr]": - return Math.Abs(doc.Netto - doc.NettoDet); + return doc.PodatekDet; case "[sbr]-[snr]": - return Math.Abs(doc.Razem - doc.Netto); + return doc.NettoDet + doc.PodatekDet - doc.Netto; } return 0;