diff --git a/Logic/Financial/OrganizationFinancialAccounts.cs b/Logic/Financial/OrganizationFinancialAccounts.cs
index dab4c9b6..bdd169ad 100644
--- a/Logic/Financial/OrganizationFinancialAccounts.cs
+++ b/Logic/Financial/OrganizationFinancialAccounts.cs
@@ -211,5 +211,31 @@ namespace Activizr.Logic.Financial
return result;
}
}
+
+ public FinancialAccounts ExpensableAccounts
+ {
+ // TODO: This needs to return a tree, not a flat list.
+
+ get
+ {
+ FinancialAccounts result = new FinancialAccounts();
+
+ int yearlyResultId = this.CostsYearlyResult.Identity;
+
+ FinancialAccounts costAccounts =
+ FinancialAccounts.ForOrganization(Organization.FromIdentity(_organizationId),
+ FinancialAccountType.Cost);
+
+ foreach (FinancialAccount account in costAccounts)
+ {
+ if (account.Identity != yearlyResultId)
+ {
+ result.Add(account);
+ }
+ }
+
+ return result;
+ }
+ }
}
}
diff --git a/Site5/Pages/v5/Finance/RequestCashAdvance.aspx b/Site5/Pages/v5/Finance/RequestCashAdvance.aspx
index 17e6026d..ce256063 100644
--- a/Site5/Pages/v5/Finance/RequestCashAdvance.aspx
+++ b/Site5/Pages/v5/Finance/RequestCashAdvance.aspx
@@ -8,7 +8,7 @@
-
+
diff --git a/Site5/Pages/v5/Finance/RequestCashAdvance.aspx.cs b/Site5/Pages/v5/Finance/RequestCashAdvance.aspx.cs
index 2cb94479..dde1d41e 100644
--- a/Site5/Pages/v5/Finance/RequestCashAdvance.aspx.cs
+++ b/Site5/Pages/v5/Finance/RequestCashAdvance.aspx.cs
@@ -1,9 +1,11 @@
using System;
using System.Collections.Generic;
+using System.Globalization;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
+using Activizr.Logic.Financial;
public partial class Pages_v5_Finance_RequestCashAdvance : PageV5Base
{
@@ -15,11 +17,25 @@ public partial class Pages_v5_Finance_RequestCashAdvance : PageV5Base
if (!Page.IsPostBack)
{
+ // Prime bank details
+
this.TextBank.Text = this.CurrentUser.BankName;
this.TextClearing.Text = this.CurrentUser.BankClearing;
this.TextAccount.Text = this.CurrentUser.BankAccount;
this.TextAmount.Text = 0.ToString("N2");
this.TextAmount.Focus();
+
+ // Prime budget dropdown
+
+ this.DropBudgets.Items.Clear();
+ this.DropBudgets.Items.Add(new ListItem(Resources.Global.Global_DropInits_SelectFinancialAccount, "0"));
+
+ FinancialAccounts accounts = this.CurrentOrganization.FinancialAccounts.ExpensableAccounts;
+
+ foreach (FinancialAccount account in accounts)
+ {
+ this.DropBudgets.Items.Add(new ListItem(account.Name, account.Identity.ToString(CultureInfo.InvariantCulture)));
+ }
}
}
}
\ No newline at end of file