From d9612bffd9a680378a2a54a69724bffbaf44aac6 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Fri, 31 May 2024 13:21:39 +0300 Subject: [PATCH] merge branch release/dyn-4487_cashflow-msfo-wthtt-bonus-column --- .../v3/Columns/CashflowMSFOWthtBonusColumn.cs | 19 ++++ .../v3/Managers/Calculation/CalculateByPI.cs | 6 +- .../Calculation/CalculateByTotalExpected.cs | 6 +- .../Managers/Calculation/CalculateDefault.cs | 11 +- .../Next/CashflowMSFOWthtBonusColumn.cs | 102 ++++++++++++++++++ .../v2/Managers/CalculateByIRRAndSum.cs | 7 ++ .../v2/Managers/CalculateByIRRNoLimit.cs | 6 ++ .../v2/Managers/CalculateByTotalExpected.cs | 6 ++ .../v2/Managers/CalculateDefault.cs | 6 ++ .../v2/Managers/CalculateWIthChangeIRR.cs | 6 ++ .../v2/Managers/ChangingLastPayment.cs | 6 ++ .../v2/Managers/EarlyRedemption.cs | 6 ++ .../v2/Managers/PERWithChangingTheTerm.cs | 6 ++ .../v2/Managers/PERWithoutChangingTheTerm.cs | 6 ++ .../v2/Managers/Suspension.cs | 6 ++ 15 files changed, 200 insertions(+), 5 deletions(-) create mode 100644 EvoCalculator.Core.Calculation/v3/Columns/CashflowMSFOWthtBonusColumn.cs create mode 100644 EvoCalculator.Core.PostCalculation/v2/Columns/Next/CashflowMSFOWthtBonusColumn.cs diff --git a/EvoCalculator.Core.Calculation/v3/Columns/CashflowMSFOWthtBonusColumn.cs b/EvoCalculator.Core.Calculation/v3/Columns/CashflowMSFOWthtBonusColumn.cs new file mode 100644 index 0000000..6bc03d9 --- /dev/null +++ b/EvoCalculator.Core.Calculation/v3/Columns/CashflowMSFOWthtBonusColumn.cs @@ -0,0 +1,19 @@ +using System; +using EvoCalculator.Core.Base.Columns; + +namespace EvoCalculator.Core.Calculation.v3.Columns; + +public class CashflowMSFOWthtBonusColumn : BaseColumnWithNominal +{ + public CashflowMSFOWthtBonusColumn(int count, BaseColumn dateTempColumn) : base(count, dateTempColumn) + { + } + + public void ComputeValues(BaseColumn cashflowMsfoColumn, + BaseColumn npvBonusExpensesColumn) + { + Values[0] = cashflowMsfoColumn.GetValue(0); + for (var i = 1; i < Values.Length; i++) + Values[i] = cashflowMsfoColumn.GetValue(i) - npvBonusExpensesColumn.GetValue(i); + } +} \ No newline at end of file diff --git a/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByPI.cs b/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByPI.cs index 9abf3df..d8df46d 100644 --- a/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByPI.cs +++ b/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByPI.cs @@ -297,6 +297,9 @@ public static partial class CalculateManager var creditVATColumn = new CreditVATColumn(12 + 4); creditVATColumn.ComputeValues(preparedValues, sumVATCreditColumn); + + var cashflowMsfoWthtBonusColumn = new CashflowMSFOWthtBonusColumn(preparedValues.Nmper + 1, dateTempColumn); + cashflowMsfoWthtBonusColumn.ComputeValues(cashflowMsfoWithCfColumn, npvBonusExpensesColumn); postValues.ComputePriceUP(sumColumn); postValues.ComputePriceUP_PR(); @@ -379,7 +382,8 @@ public static partial class CalculateManager vatRecoverableColumn, creditPaymentColumn, cashflowMsfoWithCfColumn, - piColumn + piColumn, + cashflowMsfoWthtBonusColumn } }; } diff --git a/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByTotalExpected.cs b/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByTotalExpected.cs index 6f2fe0b..d141aa1 100644 --- a/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByTotalExpected.cs +++ b/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateByTotalExpected.cs @@ -302,6 +302,9 @@ public static partial class CalculateManager sumRepaymentColumn.ComputeValues(sumCurrentColumn, sumCurrentNegativeColumn, sumCurrentInterestColumn, sumCurrentTlmColumn); sumRepaymentColumn.PostCheck(); + + var cashflowMsfoWthtBonusColumn = new CashflowMSFOWthtBonusColumn(preparedValues.Nmper + 1, dateTempColumn); + cashflowMsfoWthtBonusColumn.ComputeValues(cashflowMsfoWithCfColumn, npvBonusExpensesColumn); postValues.ComputePriceUP(sumColumn); postValues.ComputePriceUP_PR(); @@ -384,7 +387,8 @@ public static partial class CalculateManager vatRecoverableColumn, creditPaymentColumn, cashflowMsfoWithCfColumn, - piColumn + piColumn, + cashflowMsfoWthtBonusColumn } }; } diff --git a/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateDefault.cs b/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateDefault.cs index e4b4879..b5fa588 100644 --- a/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateDefault.cs +++ b/EvoCalculator.Core.Calculation/v3/Managers/Calculation/CalculateDefault.cs @@ -294,15 +294,19 @@ public static partial class CalculateManager piColumn.ComputeValues(cashflowMsfoFinal2Column, cashflowMsfoWithCfColumn); var sumRepaymentColumn = - new SumRepaymentColumn(preparedValues.Nmper + 1, postValues, requestCalculation, constants, sumColumn, piColumn, + new SumRepaymentColumn(preparedValues.Nmper + 1, postValues, requestCalculation, constants, sumColumn, + piColumn, dateTempColumn, tlmGrColumn, percentPaymentColumn, gpsGrColumn, npvBonusExpensesColumn, agentComissionExpensesColumn, negativeCashflowColumn, nsibBruttoGrColumn, subsidyExpensesColumn, extraBonusSumColumn, directorBonusSumColumn, sumCurrentColumn, sumCurrentNegativeColumn, - sumCurrentTlmColumn,sumCurrentInterestColumn); + sumCurrentTlmColumn, sumCurrentInterestColumn); sumRepaymentColumn.ComputeValues(sumCurrentColumn, sumCurrentNegativeColumn, sumCurrentInterestColumn, sumCurrentTlmColumn); sumRepaymentColumn.PostCheck(); + var cashflowMsfoWthtBonusColumn = new CashflowMSFOWthtBonusColumn(preparedValues.Nmper + 1, dateTempColumn); + cashflowMsfoWthtBonusColumn.ComputeValues(cashflowMsfoWithCfColumn, npvBonusExpensesColumn); + postValues.ComputePriceUP(sumColumn); postValues.ComputePriceUP_PR(); postValues.ComputePriceUP_Year(); @@ -384,7 +388,8 @@ public static partial class CalculateManager vatRecoverableColumn, creditPaymentColumn, cashflowMsfoWithCfColumn, - piColumn + piColumn, + cashflowMsfoWthtBonusColumn } }; } diff --git a/EvoCalculator.Core.PostCalculation/v2/Columns/Next/CashflowMSFOWthtBonusColumn.cs b/EvoCalculator.Core.PostCalculation/v2/Columns/Next/CashflowMSFOWthtBonusColumn.cs new file mode 100644 index 0000000..2d246f7 --- /dev/null +++ b/EvoCalculator.Core.PostCalculation/v2/Columns/Next/CashflowMSFOWthtBonusColumn.cs @@ -0,0 +1,102 @@ +using System; +using System.Linq; +using EvoCalculator.Core.Base.Columns; +using EvoCalculator.Core.Models.PostCalculation.Models.Prepared; +using EvoCalculator.Core.Models.PostCalculation.Models.Prepared.PreparedTables; +using EvoCalculator.Core.PostCalculation.v1; +using EvoCalculator.Core.Tools.Array; +using EvoCalculator.Core.Tools.Errors; + +namespace EvoCalculator.Core.PostCalculation.v2.Columns.Next; + +public class CashflowMSFOWthtBonusColumn : BaseColumnWithNominal +{ + public void ComputeValues(NextValues nextValues + , PreparedValues preparedValues + , BaseColumn nextSumColumn + , BaseColumn nextTLMCostColumn + , BaseColumn nextSubsidyExpensesColumn + , BaseColumn nextNSIBBruttoGrColumn + , TableInsuranceRow[] nextTableInsurance + , BaseColumn nextDateTempColumn + , BaseColumn nextTLMDateColumn + , BaseColumn currentDateTempColumn) + { + var costInsurances = Array.Empty(); + if (nextTableInsurance != null) + costInsurances = nextTableInsurance + .Where(ins => + ins.PeriodNumberInsurance > 1 + && ins.TypeRiskInsurance is "KASKO" or "OSAGO" or "GAP" or "EvoKASKO" + && ins.DateStartPeriodInsurance <= nextDateTempColumn.Values[^1]) + .OrderBy(x => x.TypeRiskInsurance) + .Select(x => -(x.CostInsurance + x.InsuranceBonusLoss)) + .ToArray(); + + var tlmCosts = Array.Empty(); + if (nextTLMCostColumn != null) tlmCosts = nextTLMCostColumn.Values.Skip(1).Select(x => -x).ToArray(); + + Values = Array.Concat( + new[] { -nextValues.AcquisitionExpenses - preparedValues.FuelCardSum } + , nextSumColumn.Values.Skip(1).ToArray() + , costInsurances + , nextNSIBBruttoGrColumn.Values.Skip(1).ToArray() + , new[] + { + -preparedValues.AgentFLSum - preparedValues.AgentULSum + } + , tlmCosts + , nextSubsidyExpensesColumn.Values.Skip(1).ToArray() + ); + + var nextTLMDates = Array.Empty(); + if (nextTLMDateColumn != null) nextTLMDates = nextTLMDateColumn.Values.Skip(1).ToArray(); + + var dateStartPeriodInsurances = Array.Empty(); + if (nextTableInsurance != null) + dateStartPeriodInsurances = nextTableInsurance + .Where(ins => + ins.PeriodNumberInsurance > 1 + && ins.TypeRiskInsurance is "KASKO" or "OSAGO" or "GAP" or "EvoKASKO" + && ins.DateStartPeriodInsurance <= nextDateTempColumn.Values[^1]) + .OrderBy(x => x.TypeRiskInsurance) + .Select(x => x.DateStartPeriodInsurance) + .ToArray(); + + Dates = Array.Concat( + new[] { nextDateTempColumn.GetValue(0) } + , nextDateTempColumn.Values.Skip(1).ToArray() + , dateStartPeriodInsurances + , nextDateTempColumn.Values.Skip(1).ToArray() + , new[] + { + nextDateTempColumn.GetValue(2) + } + , nextTLMDates + , nextDateTempColumn.Values.Skip(1).ToArray() + ); + + + var lastDateTempValue = nextDateTempColumn.Values.Last(); + var lastCurrentDateTempValue = currentDateTempColumn.Values.Last(); + var evoKasko = nextTableInsurance.FirstOrDefault(x => x.TypeRiskInsurance == "EvoKASKO"); + + if (evoKasko != null && + new DateTime(lastDateTempValue.Year, lastDateTempValue.Month, 1) > + new DateTime(lastCurrentDateTempValue.Year, lastCurrentDateTempValue.Month, 1)) + { + var evoKaskoSum = -((evoKasko.CostInsurance + evoKasko.InsuranceBonusLoss) / 12) * + ((lastDateTempValue.Year - lastCurrentDateTempValue.Year) * 12 + + lastDateTempValue.Month - lastCurrentDateTempValue.Month); + Values = Values.Append(evoKaskoSum).ToArray(); + Dates = Dates.Append(currentDateTempColumn.Values.Last().AddDays(1)).ToArray(); + } + } + + public void PostCheck() + { + if (Values.Length != Dates.Length) + throw new AppException( + $"Ошибка во время расчета столбца {GetType().Name}: не совпадает длина массива значений"); + } +} \ No newline at end of file diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateByIRRAndSum.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateByIRRAndSum.cs index 0426054..1a31991 100644 --- a/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateByIRRAndSum.cs +++ b/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateByIRRAndSum.cs @@ -248,10 +248,16 @@ public static partial class CalculateManager /* * NEXT */ + + var nextCashflowMSFOWthtBonusColumn = new CashflowMSFOWthtBonusColumn(); + nextCashflowMSFOWthtBonusColumn.ComputeValues(nextValues, preparedValues, nextSumColumn, nextTlmCostColumn, + nextSubsidyExpensesColumn, nextNSIBBruttoGrColumn, nextTableInsurance, nextDateTempColumn, + nextTlmDateColumn, currentDateTempColumn); var postValues = new v2.PostValues(preparedValues); postValues.ComputeContractEconomy(nextCashflowMSFOColumn, nextCreditColumn); postValues.ComputeContractEconomyWithVAT(nextCreditVATColumn); + return new ManagerResult @@ -308,6 +314,7 @@ public static partial class CalculateManager nextVATRecoverableColumn, nextCashflowMSFOWithCFColumn, nextPiColumn, + nextCashflowMSFOWthtBonusColumn } }; } diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateByIRRNoLimit.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateByIRRNoLimit.cs index db74aad..e6bec68 100644 --- a/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateByIRRNoLimit.cs +++ b/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateByIRRNoLimit.cs @@ -203,6 +203,11 @@ public static partial class CalculateManager /* * NEXT */ + + var nextCashflowMSFOWthtBonusColumn = new CashflowMSFOWthtBonusColumn(); + nextCashflowMSFOWthtBonusColumn.ComputeValues(nextValues, preparedValues, nextSumColumn, nextTlmCostColumn, + nextSubsidyExpensesColumn, nextNSIBBruttoGrColumn, nextTableInsurance, nextDateTempColumn, + nextTlmDateColumn, currentDateTempColumn); var postValues = new v2.PostValues(preparedValues); postValues.ComputeContractEconomy(nextCashflowMSFOColumn, nextCreditColumn); @@ -254,6 +259,7 @@ public static partial class CalculateManager nextVATRecoverableColumn, nextCashflowMSFOWithCFColumn, nextPiColumn, + nextCashflowMSFOWthtBonusColumn } }; } diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateByTotalExpected.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateByTotalExpected.cs index b472d20..cfab14c 100644 --- a/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateByTotalExpected.cs +++ b/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateByTotalExpected.cs @@ -197,6 +197,11 @@ public static partial class CalculateManager var nextPiColumn = new PIColumn(61, nextCashflowMSFOFinal2Column, nextCashflowMSFOWithCFColumn, preparedValues); nextPiColumn.ComputeValues(); + + var nextCashflowMSFOWthtBonusColumn = new CashflowMSFOWthtBonusColumn(); + nextCashflowMSFOWthtBonusColumn.ComputeValues(nextValues, preparedValues, nextSumColumn, nextTlmCostColumn, + nextSubsidyExpensesColumn, nextNSIBBruttoGrColumn, nextTableInsurance, nextDateTempColumn, + nextTlmDateColumn, currentDateTempColumn); return new ManagerResult { @@ -238,6 +243,7 @@ public static partial class CalculateManager nextVATRecoverableColumn, nextCashflowMSFOWithCFColumn, nextPiColumn, + nextCashflowMSFOWthtBonusColumn } }; } diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateDefault.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateDefault.cs index 363e08c..c4db15e 100644 --- a/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateDefault.cs +++ b/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateDefault.cs @@ -205,6 +205,11 @@ public static partial class CalculateManager /* * NEXT */ + + var nextCashflowMSFOWthtBonusColumn = new CashflowMSFOWthtBonusColumn(); + nextCashflowMSFOWthtBonusColumn.ComputeValues(nextValues, preparedValues, nextSumColumn, nextTlmCostColumn, + nextSubsidyExpensesColumn, nextNSIBBruttoGrColumn, nextTableInsurance, nextDateTempColumn, + nextTlmDateColumn, currentDateTempColumn); var postValues = new v2.PostValues(preparedValues); postValues.ComputeContractEconomy(nextCashflowMSFOColumn, nextCreditColumn); @@ -256,6 +261,7 @@ public static partial class CalculateManager nextVATRecoverableColumn, nextCashflowMSFOWithCFColumn, nextPiColumn, + nextCashflowMSFOWthtBonusColumn } }; } diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateWIthChangeIRR.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateWIthChangeIRR.cs index dea5211..969de7d 100644 --- a/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateWIthChangeIRR.cs +++ b/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateWIthChangeIRR.cs @@ -206,6 +206,11 @@ public static partial class CalculateManager /* * NEXT */ + + var nextCashflowMSFOWthtBonusColumn = new CashflowMSFOWthtBonusColumn(); + nextCashflowMSFOWthtBonusColumn.ComputeValues(nextValues, preparedValues, nextSumColumn, nextTlmCostColumn, + nextSubsidyExpensesColumn, nextNSIBBruttoGrColumn, nextTableInsurance, nextDateTempColumn, + nextTlmDateColumn, currentDateTempColumn); var postValues = new v2.PostValues(preparedValues); postValues.ComputeContractEconomy(nextCashflowMSFOColumn, nextCreditColumn); @@ -257,6 +262,7 @@ public static partial class CalculateManager nextVATRecoverableColumn, nextCashflowMSFOWithCFColumn, nextPiColumn, + nextCashflowMSFOWthtBonusColumn } }; } diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/ChangingLastPayment.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/ChangingLastPayment.cs index eb5558c..31440d9 100644 --- a/EvoCalculator.Core.PostCalculation/v2/Managers/ChangingLastPayment.cs +++ b/EvoCalculator.Core.PostCalculation/v2/Managers/ChangingLastPayment.cs @@ -192,6 +192,11 @@ public static partial class CalculateManager var nextPiColumn = new PIColumn(61, nextCashflowMSFOFinal2Column, nextCashflowMSFOWithCFColumn, preparedValues); nextPiColumn.ComputeValues(); + + var nextCashflowMSFOWthtBonusColumn = new CashflowMSFOWthtBonusColumn(); + nextCashflowMSFOWthtBonusColumn.ComputeValues(nextValues, preparedValues, nextSumColumn, nextTlmCostColumn, + nextSubsidyExpensesColumn, nextNSIBBruttoGrColumn, nextTableInsurance, nextDateTempColumn, + nextTlmDateColumn, currentDateTempColumn); return new ManagerResult { @@ -233,6 +238,7 @@ public static partial class CalculateManager nextVATRecoverableColumn, nextCashflowMSFOWithCFColumn, nextPiColumn, + nextCashflowMSFOWthtBonusColumn } }; } diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/EarlyRedemption.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/EarlyRedemption.cs index 644cdb3..6fcd547 100644 --- a/EvoCalculator.Core.PostCalculation/v2/Managers/EarlyRedemption.cs +++ b/EvoCalculator.Core.PostCalculation/v2/Managers/EarlyRedemption.cs @@ -297,6 +297,11 @@ public static partial class CalculateManager /* * NEXT */ + + var nextCashflowMSFOWthtBonusColumn = new CashflowMSFOWthtBonusColumn(); + nextCashflowMSFOWthtBonusColumn.ComputeValues(nextValues, preparedValues, nextSumColumn, nextTlmCostColumn, + nextSubsidyExpensesColumn, nextNSIBBruttoGrColumn, nextTableInsurance, nextDateTempColumn, + nextTlmDateColumn, currentDateTempColumn); var postValues = new v2.PostValues(preparedValues); postValues.ComputeContractEconomy(nextCashflowMSFOColumn, nextCreditColumn); @@ -363,6 +368,7 @@ public static partial class CalculateManager nextVATRecoverableColumn, nextCashflowMSFOWithCFColumn, nextPiColumn, + nextCashflowMSFOWthtBonusColumn } }; } diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithChangingTheTerm.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithChangingTheTerm.cs index 6556dc5..2ebe422 100644 --- a/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithChangingTheTerm.cs +++ b/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithChangingTheTerm.cs @@ -252,6 +252,11 @@ public static partial class CalculateManager /* * NEXT */ + + var nextCashflowMSFOWthtBonusColumn = new CashflowMSFOWthtBonusColumn(); + nextCashflowMSFOWthtBonusColumn.ComputeValues(nextValues, preparedValues, nextSumColumn, nextTlmCostColumn, + nextSubsidyExpensesColumn, nextNSIBBruttoGrColumn, nextTableInsurance, nextDateTempColumn, + nextTlmDateColumn, currentDateTempColumn); var postValues = new v2.PostValues(preparedValues); postValues.ComputeContractEconomy(nextCashflowMSFOColumn, nextCreditColumn); @@ -312,6 +317,7 @@ public static partial class CalculateManager nextVATRecoverableColumn, nextCashflowMSFOWithCFColumn, nextPiColumn, + nextCashflowMSFOWthtBonusColumn, } }; } diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithoutChangingTheTerm.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithoutChangingTheTerm.cs index 9e207e1..247afc2 100644 --- a/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithoutChangingTheTerm.cs +++ b/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithoutChangingTheTerm.cs @@ -217,6 +217,11 @@ public static partial class CalculateManager /* * NEXT */ + + var nextCashflowMSFOWthtBonusColumn = new CashflowMSFOWthtBonusColumn(); + nextCashflowMSFOWthtBonusColumn.ComputeValues(nextValues, preparedValues, nextSumColumn, nextTlmCostColumn, + nextSubsidyExpensesColumn, nextNSIBBruttoGrColumn, nextTableInsurance, nextDateTempColumn, + nextTlmDateColumn, currentDateTempColumn); var postValues = new v2.PostValues(preparedValues); postValues.ComputeContractEconomy(nextCashflowMSFOColumn, nextCreditColumn); @@ -271,6 +276,7 @@ public static partial class CalculateManager nextVATRecoverableColumn, nextCashflowMSFOWithCFColumn, nextPiColumn, + nextCashflowMSFOWthtBonusColumn } }; } diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/Suspension.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/Suspension.cs index bc421d6..879b922 100644 --- a/EvoCalculator.Core.PostCalculation/v2/Managers/Suspension.cs +++ b/EvoCalculator.Core.PostCalculation/v2/Managers/Suspension.cs @@ -191,6 +191,11 @@ public static partial class CalculateManager /* * NEXT */ + + var nextCashflowMSFOWthtBonusColumn = new CashflowMSFOWthtBonusColumn(); + nextCashflowMSFOWthtBonusColumn.ComputeValues(nextValues, preparedValues, nextSumColumn, nextTlmCostColumn, + nextSubsidyExpensesColumn, nextNSIBBruttoGrColumn, nextTableInsurance, nextDateTempColumn, + nextTlmDateColumn, currentDateTempColumn); var postValues = new v2.PostValues(preparedValues); postValues.ComputeContractEconomy(nextCashflowMSFOColumn, nextCreditColumn); @@ -237,6 +242,7 @@ public static partial class CalculateManager nextVATRecoverableColumn, nextCashflowMSFOWithCFColumn, nextPiColumn, + nextCashflowMSFOWthtBonusColumn = nextCashflowMSFOWthtBonusColumn } }; }