diff --git a/Common/Enums/OrganizationFinancialAccountType.cs b/Common/Enums/OrganizationFinancialAccountType.cs
index 5f5914a4..67176b0b 100644
--- a/Common/Enums/OrganizationFinancialAccountType.cs
+++ b/Common/Enums/OrganizationFinancialAccountType.cs
@@ -42,6 +42,16 @@
///
AssetsVatInbound,
+ ///
+ /// General short term holdings
+ ///
+ AssetsShortTerm,
+
+ ///
+ /// Internal transfers that are in progress
+ ///
+ AssetsTransfersInProgress,
+
///
/// If virtual banking is enabled, this is where the virtual assets go
///
diff --git a/Logic/Financial/OrganizationFinancialAccounts.cs b/Logic/Financial/OrganizationFinancialAccounts.cs
index 9747d8ec..2bbbbf4e 100644
--- a/Logic/Financial/OrganizationFinancialAccounts.cs
+++ b/Logic/Financial/OrganizationFinancialAccounts.cs
@@ -74,6 +74,15 @@ namespace Swarmops.Logic.Financial
get { return this[OrganizationFinancialAccountType.AssetsOutstandingCashAdvances]; }
}
+
+ public FinancialAccount AssetsShortTerm
+ { get { return this[OrganizationFinancialAccountType.AssetsShortTerm]; } }
+
+ public FinancialAccount AssetsTransfersInProgress
+ {
+ get { return this[OrganizationFinancialAccountType.AssetsTransfersInProgress]; }
+ }
+
public FinancialAccount AssetsPaypal
{
get { return this[OrganizationFinancialAccountType.AssetsPaypal]; }
diff --git a/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs b/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs
index 9cb2e1cf..1151a860 100644
--- a/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs
+++ b/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs
@@ -132,6 +132,24 @@ namespace Swarmops.Logic.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Short Term Assets.
+ ///
+ internal static string Asset_ShortTerm {
+ get {
+ return ResourceManager.GetString("Asset_ShortTerm", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Internal Transfers in Progress.
+ ///
+ internal static string Asset_TransfersInProgress {
+ get {
+ return ResourceManager.GetString("Asset_TransfersInProgress", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Accounting Errors.
///
diff --git a/Logic/Resources/Logic.Financial.FinancialAccount.resx b/Logic/Resources/Logic.Financial.FinancialAccount.resx
index 06341c2c..b239e1d4 100644
--- a/Logic/Resources/Logic.Financial.FinancialAccount.resx
+++ b/Logic/Resources/Logic.Financial.FinancialAccount.resx
@@ -334,4 +334,10 @@
Subsidies and Grants
+
+ Short Term Assets
+
+
+ Internal Transfers in Progress
+
\ No newline at end of file
diff --git a/Logic/Structure/Organization.cs b/Logic/Structure/Organization.cs
index 478f8181..f3d5e896 100644
--- a/Logic/Structure/Organization.cs
+++ b/Logic/Structure/Organization.cs
@@ -462,6 +462,14 @@ namespace Swarmops.Logic.Structure
FinancialAccount.Create (this, "[LOC]Asset_OutboundInvoices", FinancialAccountType.Asset, null);
FinancialAccounts[OrganizationFinancialAccountType.AssetsOutstandingCashAdvances] =
FinancialAccount.Create (this, "[LOC]Asset_CashAdvances", FinancialAccountType.Asset, null);
+
+ FinancialAccount shortTermAssets = FinancialAccount.Create(this, "[LOC]Asset_ShortTerm",
+ FinancialAccountType.Asset, null);
+ FinancialAccounts[OrganizationFinancialAccountType.AssetsShortTerm] = shortTermAssets;
+ FinancialAccounts[OrganizationFinancialAccountType.AssetsTransfersInProgress] =
+ FinancialAccount.Create(this, "[LOC]Asset_TransfersInProgress", FinancialAccountType.Asset,
+ shortTermAssets);
+
FinancialAccounts[OrganizationFinancialAccountType.CostsAllocatedFunds] =
FinancialAccount.Create (this, "[LOC]Cost_AllocatedFunds", FinancialAccountType.Cost, null);
FinancialAccounts[OrganizationFinancialAccountType.CostsInfrastructure] =