diff --git a/Site5/App_GlobalResources/Pages.Financial.resx b/Site5/App_GlobalResources/Pages.Financial.resx
index eaad7470..3a5c9723 100644
--- a/Site5/App_GlobalResources/Pages.Financial.resx
+++ b/Site5/App_GlobalResources/Pages.Financial.resx
@@ -279,6 +279,9 @@
Salary #{0:N0} for {1} was DE-attested. It will not be paid out unless attested again.
When somebody undoes a previous attestation.
+
+ <strong>WARNING: UNINITIALIZED BUDGET</strong><br/><br/>The cost you're approving belongs to an uninitialized budget -- an account in the ledger that lacks owner and doesn't have a set budget allowance for the year. Consider visiting the Account Plan and allocating budgets for the expected revenue and expenses.<br/><br/>This message will only display once per visit to Attestations.<br/>
+
Invoice amount (in {0})
{0} is the organization's main currency.
diff --git a/Site5/Pages/v5/Financial/AttestCosts.aspx b/Site5/Pages/v5/Financial/AttestCosts.aspx
index 9d2212ea..1f381376 100644
--- a/Site5/Pages/v5/Financial/AttestCosts.aspx
+++ b/Site5/Pages/v5/Financial/AttestCosts.aspx
@@ -32,6 +32,8 @@
'/Images/Icons/iconshock-balloon-undo-128x96px-hot.png'
]);
+ loadUninitializedBudgets(); // no need to wait for doc.ready
+
$(document).ready(function () {
$('#TableAttestableCosts').datagrid(
{
@@ -278,6 +280,12 @@
budgetRemainingLookup[accountId] += funds;
setAttestability();
+ if (budgetUninitializedLookup[accountId] == true && uninitializedPopupDisplayed == false) {
+ alertify.alert(decodeURIComponent(''));
+ uninitializedPopupDisplayed = true;
+ }
+
+
$.ajax({
type: "POST",
url: "/Pages/v5/Financial/AttestCosts.aspx/Attest",
@@ -327,6 +335,16 @@
});
}
+ function loadUninitializedBudgets() {
+ SwarmopsJS.ajaxCall("/Pages/v5/Financial/AttestCosts.aspx/GetUninitializedBudgets", {}, function(data) {
+ console.log(data);
+ data.forEach(function(accountData, dummy1, dummy2) {
+ budgetUninitializedLookup[accountData] = true;
+ // console.log("Rechecking budget " + accountData.AccountId + ": remaining is " + accountData.Remaining);
+ });
+ });
+ }
+
function setAttestability() {
@@ -337,7 +355,7 @@
// console.log("attestability checking accountid " + accountId + ", amount requested is " + amountRequested + ", funds in budget is " + fundsInBudget);
- if (fundsInBudget >= amountRequested) {
+ if (fundsInBudget >= amountRequested || budgetUninitializedLookup[accountId] == true) {
// console.log("- removing insufficience marker");
$(this).removeClass("LocalFundsInsufficient");
if ($(this).attr("rel") != "loading") {
@@ -445,6 +463,8 @@
var recordId = '';
var accountId = 0;
var budgetRemainingLookup = {};
+ var budgetUninitializedLookup = {};
+ var uninitializedPopupDisplayed = false;
// The variable below is advisory for the UI - actual access control is done server-side
var canOverdraftBudgets = ;
diff --git a/Site5/Pages/v5/Financial/AttestCosts.aspx.cs b/Site5/Pages/v5/Financial/AttestCosts.aspx.cs
index 869c440e..76730191 100644
--- a/Site5/Pages/v5/Financial/AttestCosts.aspx.cs
+++ b/Site5/Pages/v5/Financial/AttestCosts.aspx.cs
@@ -68,12 +68,12 @@ namespace Swarmops.Frontend.Pages.v5.Financial
// checks the owner.
Dictionary result = new Dictionary();
- FinancialAccounts accounts = FinancialAccounts.ForOrganization (authData.CurrentOrganization);
+ FinancialAccounts accounts = FinancialAccounts.ForOrganization(authData.CurrentOrganization);
foreach (FinancialAccount account in accounts)
{
- if (account.OwnerPersonId == authData.CurrentUser.Identity ||
- (account.OwnerPersonId == 0 && authData.Authority.HasAccess (new Access (authData.CurrentOrganization, AccessAspect.Administration))))
+ if (account.OwnerPersonId == authData.CurrentUser.Identity ||
+ (account.OwnerPersonId == 0 && authData.Authority.HasAccess(new Access(authData.CurrentOrganization, AccessAspect.Administration))))
{
if (account.AccountType == FinancialAccountType.Cost)
{
@@ -85,6 +85,32 @@ namespace Swarmops.Frontend.Pages.v5.Financial
return result;
}
+ [WebMethod]
+ public static int[] GetUninitializedBudgets()
+ {
+ AuthenticationData authData = GetAuthenticationDataAndCulture();
+
+ // This function finds the exceptional accounts that aren't initialized, to let a sysadmin approve expenses to them.
+
+ List result = new List();
+ FinancialAccounts accounts = FinancialAccounts.ForOrganization(authData.CurrentOrganization);
+
+ foreach (FinancialAccount account in accounts)
+ {
+ if (account.AccountType == FinancialAccountType.Cost)
+ {
+ if (account.OwnerPersonId == 0 &&
+ authData.Authority.HasAccess (new Access (authData.CurrentOrganization,
+ AccessAspect.Administration)))
+ {
+ result.Add (account.Identity);
+ }
+ }
+ }
+
+ return result.ToArray();
+ }
+
private void Localize()
{
PageTitle = Resources.Pages.Financial.AttestCosts_PageTitle;
@@ -99,6 +125,8 @@ namespace Swarmops.Frontend.Pages.v5.Financial
this.LabelGridHeaderRequested.Text = Resources.Pages.Financial.AttestCosts_GridHeader_Requested;
this.LiteralErrorInsufficientBudget.Text = JavascriptEscape (Resources.Pages.Financial.AttestCosts_OutOfBudget);
+ this.LiteralWarnUnintializedBudget.Text =
+ JavascriptEscape (Resources.Pages.Financial.AttestCosts_Warn_UninitializedBudget);
this.LabelDescribeDeny.Text = Resources.Pages.Financial.AttestCosts_Modal_DescribeOptionDeny;
this.LabelDescribeCorrect.Text = String.Format (Resources.Pages.Financial.AttestCosts_Modal_DescribeOptionAmount, CurrentOrganization.Currency.DisplayCode);