From ddf82b9b2bd2611c9b25b2625bd1f7ec8e72b5e0 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Fri, 31 May 2024 14:05:23 +0300 Subject: [PATCH] Sale: fix cashflowMsfoWthtBonusColumn --- .../v3/Managers/Calculation/CalculateByPI.cs | 2 +- .../v3/Managers/Calculation/CalculateByTotalExpected.cs | 2 +- .../v3/Managers/Calculation/CalculateDefault.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByPI.cs b/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByPI.cs index d8df46d..1e10c03 100644 --- a/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByPI.cs +++ b/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByPI.cs @@ -299,7 +299,7 @@ public static partial class CalculateManager creditVATColumn.ComputeValues(preparedValues, sumVATCreditColumn); var cashflowMsfoWthtBonusColumn = new CashflowMSFOWthtBonusColumn(preparedValues.Nmper + 1, dateTempColumn); - cashflowMsfoWthtBonusColumn.ComputeValues(cashflowMsfoWithCfColumn, npvBonusExpensesColumn); + cashflowMsfoWthtBonusColumn.ComputeValues(cashflowMsfoColumn, npvBonusExpensesColumn); postValues.ComputePriceUP(sumColumn); postValues.ComputePriceUP_PR(); diff --git a/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByTotalExpected.cs b/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByTotalExpected.cs index d141aa1..4c3b792 100644 --- a/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByTotalExpected.cs +++ b/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByTotalExpected.cs @@ -304,7 +304,7 @@ public static partial class CalculateManager sumRepaymentColumn.PostCheck(); var cashflowMsfoWthtBonusColumn = new CashflowMSFOWthtBonusColumn(preparedValues.Nmper + 1, dateTempColumn); - cashflowMsfoWthtBonusColumn.ComputeValues(cashflowMsfoWithCfColumn, npvBonusExpensesColumn); + cashflowMsfoWthtBonusColumn.ComputeValues(cashflowMsfoColumn, npvBonusExpensesColumn); postValues.ComputePriceUP(sumColumn); postValues.ComputePriceUP_PR(); diff --git a/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateDefault.cs b/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateDefault.cs index b5fa588..3885824 100644 --- a/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateDefault.cs +++ b/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateDefault.cs @@ -305,7 +305,7 @@ public static partial class CalculateManager sumRepaymentColumn.PostCheck(); var cashflowMsfoWthtBonusColumn = new CashflowMSFOWthtBonusColumn(preparedValues.Nmper + 1, dateTempColumn); - cashflowMsfoWthtBonusColumn.ComputeValues(cashflowMsfoWithCfColumn, npvBonusExpensesColumn); + cashflowMsfoWthtBonusColumn.ComputeValues(cashflowMsfoColumn, npvBonusExpensesColumn); postValues.ComputePriceUP(sumColumn); postValues.ComputePriceUP_PR();