From 69b60d0410d4d7941960e2b718b7c002fe923d3d Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sun, 9 Dec 2018 16:54:47 +0100 Subject: [PATCH] Testing --- Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs b/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs index b5ebed5e..cca25f93 100644 --- a/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs +++ b/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs @@ -44,7 +44,8 @@ namespace Swarmops.Frontend.Pages.Ledgers FinancialAccounts assetAccounts = FinancialAccounts.ForOrganization(this.CurrentOrganization, FinancialAccountType.Asset); - int lastMonth = DateTime.UtcNow.Year*100 + DateTime.UtcNow.Month; + DateTime lastMonthEndDate = new DateTime(DateTime.UtcNow.Year, DateTime.UtcNow.Month, 1).AddDays(-1); + int lastMonth = lastMonthEndDate.Year*100 + lastMonthEndDate.Month; foreach (FinancialAccount assetAccount in assetAccounts) { @@ -78,13 +79,20 @@ namespace Swarmops.Frontend.Pages.Ledgers bankStatement.Id = lastId = "BankStatement-" + assetAccount.Identity.ToString(CultureInfo.InvariantCulture) + monthIterator; bankStatement.Name = string.Format(Resources.Pages.Ledgers.EndOfMonth_UploadBankStatementFor, - assetAccount.Name, "PDF", "last month"); + assetAccount.Name, "PDF", new DateTime(monthIterator / 100, monthIterator % 100, 15).ToString("MMMM yyyy")); bankStatement.Completed = false; // TODO + + group1.Items.Add(bankStatement); } } } + if (group1.Items.Count > 0) + { + ItemGroups.Add(group1); + } + EomItemGroup group2 = new EomItemGroup(); group2.Header = Resources.Pages.Ledgers.EndOfMonth_Header_PayrollTaxes; group2.Id = "PayrollTaxes";