From c33506c7dfe5a96889a064eb1782259b077f8a0a Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 4 Feb 2013 12:11:45 +0000 Subject: [PATCH] SOme more work --- Logic/Financial/CashAdvance.cs | 5 +++++ Site5/Pages/v5/Finance/Json-AttestableCosts.aspx.cs | 2 +- Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Logic/Financial/CashAdvance.cs b/Logic/Financial/CashAdvance.cs index 3d8ad673..9e6d9977 100644 --- a/Logic/Financial/CashAdvance.cs +++ b/Logic/Financial/CashAdvance.cs @@ -63,6 +63,11 @@ namespace Swarmops.Logic.Financial #endregion + public Person Person + { + get { return Person.FromIdentity(this.PersonId); } + } + public FinancialAccount FinancialAccount { get { return FinancialAccount.FromIdentity(this.FinancialAccountId); } diff --git a/Site5/Pages/v5/Finance/Json-AttestableCosts.aspx.cs b/Site5/Pages/v5/Finance/Json-AttestableCosts.aspx.cs index cba90400..c3c8b51e 100644 --- a/Site5/Pages/v5/Finance/Json-AttestableCosts.aspx.cs +++ b/Site5/Pages/v5/Finance/Json-AttestableCosts.aspx.cs @@ -135,7 +135,7 @@ public partial class Pages_v5_Finance_Json_AttestableCosts : System.Web.UI.Page foreach (CashAdvance advance in advances) { - _items.Add(new AttestableItem("A" + advance.Identity.ToString(CultureInfo.InvariantCulture), "Beneficiary", advance.AmountCents, advance.FinancialAccount, "Description", "Advance", advance)); + _items.Add(new AttestableItem("A" + advance.Identity.ToString(CultureInfo.InvariantCulture), advance.Person.Name, advance.AmountCents, advance.FinancialAccount, advance.Description, "AttestCosts_Advance", advance)); } } diff --git a/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx b/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx index 28aab6ec..ef102ea6 100644 --- a/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx +++ b/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx @@ -84,7 +84,7 @@

 Loading

-