Merge branch 'master' of https://github.com/Swarmops/Swarmops
This commit is contained in:
+1
-1
@@ -115,7 +115,7 @@ namespace Resources.Pages {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 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?.
|
||||
/// </summary>
|
||||
internal static string AccountPlan_Edit_AdministrativeLong {
|
||||
get {
|
||||
|
||||
@@ -402,7 +402,8 @@
|
||||
<value>Active</value>
|
||||
</data>
|
||||
<data name="AccountPlan_Edit_AdministrativeLong" xml:space="preserve">
|
||||
<value>Are transactions here excluded from 2-D reports?</value>
|
||||
<value>Is this an account after the EBITDA line?</value>
|
||||
<comment>Earnings before interest, tax, depreciation and amortization (EBITDA) is a measure of a company's operating performance.</comment>
|
||||
</data>
|
||||
<data name="AccountPlan_Edit_AdministrativeShort" xml:space="preserve">
|
||||
<value>Admin</value>
|
||||
|
||||
@@ -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');
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user