diff --git a/Site/App_GlobalResources/Pages.Ledgers.designer.cs b/Site/App_GlobalResources/Pages.Ledgers.designer.cs index ee5ec096..4697eab6 100644 --- a/Site/App_GlobalResources/Pages.Ledgers.designer.cs +++ b/Site/App_GlobalResources/Pages.Ledgers.designer.cs @@ -115,7 +115,7 @@ namespace Resources.Pages { } /// - /// Looks up a localized string similar to Are transactions here excluded from 2-D reports?. + /// Looks up a localized string similar to Is this an account after the EBITDA line?. /// internal static string AccountPlan_Edit_AdministrativeLong { get { diff --git a/Site/App_GlobalResources/Pages.Ledgers.resx b/Site/App_GlobalResources/Pages.Ledgers.resx index 5cd2016c..0846e416 100644 --- a/Site/App_GlobalResources/Pages.Ledgers.resx +++ b/Site/App_GlobalResources/Pages.Ledgers.resx @@ -402,7 +402,8 @@ Active - Are transactions here excluded from 2-D reports? + Is this an account after the EBITDA line? + Earnings before interest, tax, depreciation and amortization (EBITDA) is a measure of a company's operating performance. Admin diff --git a/Site/Pages/v5/Ledgers/EndOfMonth.aspx b/Site/Pages/v5/Ledgers/EndOfMonth.aspx index 4e3484bf..e5223e3c 100644 --- a/Site/Pages/v5/Ledgers/EndOfMonth.aspx +++ b/Site/Pages/v5/Ledgers/EndOfMonth.aspx @@ -14,6 +14,7 @@ // set action icons to their respective initial icons + $('img.eomitem-wrench').attr('src', '/Images/Icons/iconshock-balloon-wrench-128x96px.png'); $('img.eomitem-document').attr('src', '/Images/Icons/iconshock-balloon-invoice-128x96px.png'); $('img.eomitem-upload').attr('src', '/Images/Icons/iconshock-upload-128x96px.png'); diff --git a/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs b/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs index 667e4f32..509a5644 100644 --- a/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs +++ b/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs @@ -39,6 +39,8 @@ namespace Swarmops.Frontend.Pages.Ledgers group1.Header = Resources.Pages.Ledgers.EndOfMonth_Header_ExternalData; group1.Id = "ExternalData"; + string lastUploadItemId = string.Empty; + // Iterate over all Balance accounts and check for automation; // if so, add it to an upload sequence @@ -94,9 +96,30 @@ namespace Swarmops.Frontend.Pages.Ledgers group1.Items.Add(bankStatement); } + // Add data upload item + + EomItem dataUploadItem = new EomItem(); + dataUploadItem.Id = "BankDataUpload-" + assetAccount.Identity.ToString(CultureInfo.InvariantCulture); + } } + // If there are any items in Group 1, OR if an account matching is necessary, then + // add that as an action item + + if (group1.Items.Count() > 0 || FinancialTransactions.GetUnbalanced(this.CurrentOrganization).Count() > 0) + { + EomItem matchAccounts = new EomItem(); + matchAccounts.DependsOn = lastUploadItemId; // may be empty if there's nothing to upload and that's ok + matchAccounts.Id = "MatchAccounts"; + matchAccounts.Completed = false; // we already know there's at least one unbalanced + matchAccounts.Icon = "wrench"; + matchAccounts.Skippable = false; + matchAccounts.Name = Resources.Pages.Ledgers.EndOfMonth_MatchAccounts; + + group1.Items.Add(matchAccounts); + } + if (group1.Items.Count > 0) { ItemGroups.Add(group1);