From 0194e7f04491015ac84283ef84e9669d20b2fbac Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sat, 5 May 2018 19:22:55 +0200 Subject: [PATCH] Result display fixes (the backend seems fine) --- Logic/Financial/FinancialAccount.cs | 2 +- Site/Pages/v5/Ledgers/AccountPlan.aspx.cs | 2 +- Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Logic/Financial/FinancialAccount.cs b/Logic/Financial/FinancialAccount.cs index 76dcd7f4..74586a12 100644 --- a/Logic/Financial/FinancialAccount.cs +++ b/Logic/Financial/FinancialAccount.cs @@ -202,7 +202,7 @@ namespace Swarmops.Logic.Financial } - public Money InitialBalanceCents + public Money InitialBalance { set { diff --git a/Site/Pages/v5/Ledgers/AccountPlan.aspx.cs b/Site/Pages/v5/Ledgers/AccountPlan.aspx.cs index 9157aadc..5288e51a 100644 --- a/Site/Pages/v5/Ledgers/AccountPlan.aspx.cs +++ b/Site/Pages/v5/Ledgers/AccountPlan.aspx.cs @@ -336,7 +336,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers Int64 desiredInitialBalanceCents = Formatting.ParseDoubleStringAsCents(newInitialBalanceString); - account.InitialBalanceCents = new Money(desiredInitialBalanceCents, account.Organization.Currency); // only avaialable for presentation currencies + account.InitialBalance = new Money(desiredInitialBalanceCents, account.Organization.Currency); // only avaialable for presentation currencies return new ChangeAccountDataResult { diff --git a/Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs b/Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs index e6acd001..8452f0aa 100644 --- a/Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs +++ b/Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs @@ -316,7 +316,7 @@ namespace Swarmops.Site.Pages.Ledgers String.Format( Resources.Pages.Ledgers.UploadBankFiles_ResultsInitialBalanceSetForeignCurrency, Currency.FromCode(resultDetail.CurrencyCode).DisplayCode, - -resultDetail.BalanceMismatchCents); + resultDetail.BalanceMismatchCents); } html += ".

"; @@ -813,10 +813,15 @@ namespace Swarmops.Site.Pages.Ledgers if (autosetInitialBalance) { Int64 newInitialBalanceCents = -result.BalanceMismatchCents; + Money initialBalance = new Money(newInitialBalanceCents, accountCurrency); - assetAccount.InitialBalanceCents = new Money(newInitialBalanceCents, accountCurrency); + assetAccount.InitialBalance = initialBalance; result.InitialBalanceCents = newInitialBalanceCents; result.InitialBalanceCurrencyCode = accountCurrency.Code; + + // make an approximation of conversion rate set for initial balance in presentation to tell user + initialBalance.ValuationDateTime = new DateTime(assetAccount.Organization.FirstFiscalYear, 1, 1); + result.BalanceMismatchCents = initialBalance.ToCurrency(assetAccount.Organization.Currency).Cents; } }