diff --git a/Logic/Financial/Salary.cs b/Logic/Financial/Salary.cs index a58134df..c2ce8883 100644 --- a/Logic/Financial/Salary.cs +++ b/Logic/Financial/Salary.cs @@ -130,14 +130,14 @@ namespace Swarmops.Logic.Financial public void Attest (Person attester) { SwarmDb.GetDatabaseForWriting().CreateFinancialValidation (FinancialValidationType.Attestation, - FinancialDependencyType.Salary, Identity, DateTime.Now, attester.Identity, NetSalaryCents/100.0); + FinancialDependencyType.Salary, Identity, DateTime.Now, attester.Identity, CostTotalCents/100.0); SwarmDb.GetDatabaseForWriting().SetSalaryAttested (Identity, true); } public void Deattest (Person deattester) { SwarmDb.GetDatabaseForWriting().CreateFinancialValidation (FinancialValidationType.Attestation, - FinancialDependencyType.Salary, Identity, DateTime.Now, deattester.Identity, NetSalaryCents/100.0); + FinancialDependencyType.Salary, Identity, DateTime.Now, deattester.Identity, CostTotalCents/100.0); SwarmDb.GetDatabaseForWriting().SetSalaryAttested (Identity, false); } diff --git a/Site/Pages/v5/Financial/Json-AttestableCosts.aspx.cs b/Site/Pages/v5/Financial/Json-AttestableCosts.aspx.cs index b20d7e26..bb5c4436 100644 --- a/Site/Pages/v5/Financial/Json-AttestableCosts.aspx.cs +++ b/Site/Pages/v5/Financial/Json-AttestableCosts.aspx.cs @@ -208,7 +208,7 @@ public partial class Pages_v5_Finance_Json_AttestableCosts : DataV5Base private void PopulateSalaries() { - Salaries salaries = Salaries.ForOrganization (CurrentOrganization).WhereUnattested; + Salaries salaries = Salaries.ForOrganization (CurrentOrganization); // No unattestability for previously attested salaries because complex @@ -217,10 +217,20 @@ public partial class Pages_v5_Finance_Json_AttestableCosts : DataV5Base if (this._attestationRights.ContainsKey (salary.PayrollItem.BudgetId) || salary.PayrollItem.Budget.OwnerPersonId == Person.NobodyId) { - this._items.Add (new AttestableItem ("S" + salary.Identity.ToString (CultureInfo.InvariantCulture), - salary.PayrollItem.PersonCanonical, salary.CostTotalCents, salary.PayrollItem.Budget, - "[Loc]Financial_SalarySpecification|[Date]" + - salary.PayoutDate.ToString (CultureInfo.InvariantCulture), "Financial_Salary", false, salary)); + if (salary.Attested) + { + this._items.Add(new AttestableItem("S" + salary.Identity.ToString(CultureInfo.InvariantCulture), + salary.PayrollItem.PersonCanonical, salary.CostTotalCents, salary.PayrollItem.Budget, + "[Loc]Financial_SalarySpecification|[Date]" + + salary.PayoutDate.ToString(CultureInfo.InvariantCulture), "Financial_Salary", false, salary)); + } + else + { + this._attestedItems.Add(new AttestableItem("S" + salary.Identity.ToString(CultureInfo.InvariantCulture), + salary.PayrollItem.PersonCanonical, salary.CostTotalCents, salary.PayrollItem.Budget, + "[Loc]Financial_SalarySpecification|[Date]" + + salary.PayoutDate.ToString(CultureInfo.InvariantCulture), "Financial_Salary", false, salary)); + } } } }