Fixed VAT report naming

This commit is contained in:
Rick Falkvinge
2018-12-03 16:40:30 +01:00
parent c39a2e3bc1
commit d4ed9bbe7e
2 changed files with 6 additions and 5 deletions
+4 -3
View File
@@ -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));
}
+2 -2
View File
@@ -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'
});