From e560f324ac4667285dcbd14813c2ec86d93940dc Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Wed, 2 Sep 2015 21:17:33 +0200 Subject: [PATCH] Fix for salary processing bug --- Logic/Financial/PayrollItem.cs | 4 +++- Logic/Support/LogEntries/SalaryCreatedLogEntry.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Logic/Financial/PayrollItem.cs b/Logic/Financial/PayrollItem.cs index eb3d0d44..3d09b8fa 100644 --- a/Logic/Financial/PayrollItem.cs +++ b/Logic/Financial/PayrollItem.cs @@ -52,7 +52,9 @@ namespace Swarmops.Logic.Financial private new int PersonId { - get { return base.PersonId; // hides base's personId + get + { + return base.PersonId; // hides base's personId } } diff --git a/Logic/Support/LogEntries/SalaryCreatedLogEntry.cs b/Logic/Support/LogEntries/SalaryCreatedLogEntry.cs index 2b4fe6d5..8ea5c694 100644 --- a/Logic/Support/LogEntries/SalaryCreatedLogEntry.cs +++ b/Logic/Support/LogEntries/SalaryCreatedLogEntry.cs @@ -23,7 +23,7 @@ namespace Swarmops.Logic.Support.LogEntries FinancialAccountName = salary.Budget.Name; OrganizationId = salary.PayrollItem.OrganizationId; OwnerPersonId = salary.PayrollItem.ReportsToPersonId; - OwnerPersonName = salary.PayrollItem.ReportsToPerson.Canonical; + OwnerPersonName = salary.PayrollItem.ReportsToPersonId != 0? salary.PayrollItem.ReportsToPerson.Canonical: "Nobody"; } } } \ No newline at end of file