diff --git a/Site/App_GlobalResources/Pages.Ledgers.designer.cs b/Site/App_GlobalResources/Pages.Ledgers.designer.cs
index ee5ec096..4dcfd9c0 100644
--- a/Site/App_GlobalResources/Pages.Ledgers.designer.cs
+++ b/Site/App_GlobalResources/Pages.Ledgers.designer.cs
@@ -1186,7 +1186,7 @@ namespace Resources.Pages {
}
///
- /// Looks up a localized string similar to Upload Bank Statement ({1}) for {0} for {2}.
+ /// Looks up a localized string similar to Upload Bank <strong>Statement</strong> ({1}) for {0} for {2}.
///
internal static string EndOfMonth_UploadBankStatementFor {
get {
@@ -1195,7 +1195,7 @@ namespace Resources.Pages {
}
///
- /// Looks up a localized string similar to Upload Transaction Data ({1}) for {0}.
+ /// Looks up a localized string similar to Upload <strong>Transaction Data</strong> ({1}) for {0}.
///
internal static string EndOfMonth_UploadTransactionDataFor {
get {
diff --git a/Site/App_GlobalResources/Pages.Ledgers.resx b/Site/App_GlobalResources/Pages.Ledgers.resx
index 5cd2016c..4a752d98 100644
--- a/Site/App_GlobalResources/Pages.Ledgers.resx
+++ b/Site/App_GlobalResources/Pages.Ledgers.resx
@@ -1018,11 +1018,11 @@
Parameter zero is the month that's just ended
- Upload Bank Statement ({1}) for {0} for {2}
+ Upload Bank <strong>Statement</strong> ({1}) for {0} for {2}
Parameter zero is the account name, parameter one the format (e.g. PDF), parameter two is the month (e.g. October 2018)
- Upload Transaction Data ({1}) for {0}
+ Upload <strong>Transaction Data</strong> ({1}) for {0}
Parameter zero is the account name, parameter one is the format (e.g. XML or CSV)
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 c31c4c31..ad5e9938 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,27 @@ namespace Swarmops.Frontend.Pages.Ledgers
group1.Items.Add(bankStatement);
}
+ // Add data upload item
+
}
}
+ // 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);