From d4ed9bbe7e2b53a3fa3e4fc136a8fc669f810f99 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 3 Dec 2018 16:40:30 +0100 Subject: [PATCH] Fixed VAT report naming --- Logic/Financial/VatReport.cs | 7 ++++--- Site/Pages/v5/Ledgers/EndOfMonth.aspx | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Logic/Financial/VatReport.cs b/Logic/Financial/VatReport.cs index 0e60fc7e..d1bcbc11 100644 --- a/Logic/Financial/VatReport.cs +++ b/Logic/Financial/VatReport.cs @@ -364,20 +364,21 @@ namespace Swarmops.Logic.Financial { DateTime nextReportDue = NextReportDue(organization); int monthInterval = organization.VatReportFrequencyMonths; + DateTime nextReportConcerns = nextReportDue.AddMonths(-monthInterval); switch (monthInterval) { case 1: return String.Format(Resources.Logic_Financial_VatReport.Description_SingleMonth, - new DateTime(nextReportDue.Year, nextReportDue.Month, 2)); // the 2 is to prevent timezone errors + new DateTime(nextReportDue.Year, nextReportConcerns.Month, 2)); // the 2 is to prevent timezone errors case 12: return String.Format(Resources.Logic_Financial_VatReport.Description_FullYear, - nextReportDue.Year); + nextReportConcerns.Year); default: return String.Format(Resources.Logic_Financial_VatReport.Description_Months, - nextReportDue, nextReportDue.AddMonths(monthInterval - 1)); + nextReportConcerns, nextReportConcerns.AddMonths(monthInterval - 1)); } diff --git a/Site/Pages/v5/Ledgers/EndOfMonth.aspx b/Site/Pages/v5/Ledgers/EndOfMonth.aspx index 40ea41fc..6619c21d 100644 --- a/Site/Pages/v5/Ledgers/EndOfMonth.aspx +++ b/Site/Pages/v5/Ledgers/EndOfMonth.aspx @@ -21,7 +21,7 @@ $('#TableEomItems').datagrid('mergeCells', { index: rowCount - 1, - colspan: 4, + colspan: 2, type: 'body', field: 'itemGroupName' }); @@ -51,7 +51,7 @@ $('#TableEomItems').datagrid('mergeCells', { index: rowCount - 1, - colspan: 4, + colspan: 2, type: 'body', field: 'itemGroupName' });