Account Plan enhancements 5

This commit is contained in:
Rick Falkvinge
2015-01-24 09:56:16 +01:00
parent 9339511baa
commit cfa76018d0
3 changed files with 5 additions and 3 deletions
@@ -27,6 +27,8 @@ namespace Swarmops.Frontend.Automation
excludeId = Int32.Parse (excludeIdString);
}
int resultsAccountId = CurrentOrganization.FinancialAccounts.CostsYearlyResult.Identity;
// Get accounts
FinancialAccounts accounts = FinancialAccounts.ForOrganization (CurrentOrganization, accountType);
@@ -37,7 +39,7 @@ namespace Swarmops.Frontend.Automation
foreach (FinancialAccount account in accounts)
{
if (account.Identity == excludeId)
if (account.Identity == excludeId || account.Identity == resultsAccountId)
{
continue;
}
+1 -1
View File
@@ -49,7 +49,7 @@
beginEditAccount();
});
if ($('#CheckOptionShowInactive').prop("checked"))
if ($('#CheckOptionsShowInactive').prop("checked"))
{
$('.RowInactive').show();
}
@@ -64,7 +64,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
}
else if (type == FinancialAccountType.Cost && projectedResults >= 0) // expected loss or zero
{
childrenString += "," + GetProfitLossNode("ProjectedLoss", projectedResults);
childrenString += "," + GetProfitLossNode("ProjectedLoss", -projectedResults);
}
string addString =