diff --git a/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs b/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs index dce8b62c..ea1d857a 100644 --- a/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs +++ b/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -141,6 +141,15 @@ namespace Swarmops.Logic.Resources { } } + /// + /// Looks up a localized string similar to Airfare, Airports, and Transit. + /// + internal static string Cost_Airfare { + get { + return ResourceManager.GetString("Cost_Airfare", resourceCulture); + } + } + /// /// Looks up a localized string similar to Allocated Funds. /// @@ -169,7 +178,7 @@ namespace Swarmops.Logic.Resources { } /// - /// Looks up a localized string similar to Financial Fees. + /// Looks up a localized string similar to Bank Fees. /// internal static string Cost_BankFees { get { @@ -204,6 +213,15 @@ namespace Swarmops.Logic.Resources { } } + /// + /// Looks up a localized string similar to Financial fees. + /// + internal static string Cost_FinancialFees { + get { + return ResourceManager.GetString("Cost_FinancialFees", resourceCulture); + } + } + /// /// Looks up a localized string similar to Forex Capital Losses. /// @@ -213,6 +231,15 @@ namespace Swarmops.Logic.Resources { } } + /// + /// Looks up a localized string similar to Hospitality. + /// + internal static string Cost_Hospitality { + get { + return ResourceManager.GetString("Cost_Hospitality", resourceCulture); + } + } + /// /// Looks up a localized string similar to ICT and Infrastructure. /// @@ -231,6 +258,15 @@ namespace Swarmops.Logic.Resources { } } + /// + /// Looks up a localized string similar to Legal fees. + /// + internal static string Cost_LegalFees { + get { + return ResourceManager.GetString("Cost_LegalFees", resourceCulture); + } + } + /// /// Looks up a localized string similar to Marketing and Campaigns. /// @@ -240,6 +276,15 @@ namespace Swarmops.Logic.Resources { } } + /// + /// Looks up a localized string similar to Office Equipment. + /// + internal static string Cost_OfficeEquipment { + get { + return ResourceManager.GetString("Cost_OfficeEquipment", resourceCulture); + } + } + /// /// Looks up a localized string similar to Offices. /// @@ -249,6 +294,24 @@ namespace Swarmops.Logic.Resources { } } + /// + /// Looks up a localized string similar to Office Space & Maintenance. + /// + internal static string Cost_OfficeSpace { + get { + return ResourceManager.GetString("Cost_OfficeSpace", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Public Transit. + /// + internal static string Cost_PublicTransit { + get { + return ResourceManager.GetString("Cost_PublicTransit", resourceCulture); + } + } + /// /// Looks up a localized string similar to Research and Development. /// @@ -312,6 +375,24 @@ namespace Swarmops.Logic.Resources { } } + /// + /// Looks up a localized string similar to Taxi, Limo, etc. + /// + internal static string Cost_TaxiTransport { + get { + return ResourceManager.GetString("Cost_TaxiTransport", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Trains and Ferries. + /// + internal static string Cost_TrainsFerries { + get { + return ResourceManager.GetString("Cost_TrainsFerries", resourceCulture); + } + } + /// /// Looks up a localized string similar to Transportation. /// @@ -321,6 +402,33 @@ namespace Swarmops.Logic.Resources { } } + /// + /// Looks up a localized string similar to Travel. + /// + internal static string Cost_Travel { + get { + return ResourceManager.GetString("Cost_Travel", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Lodging. + /// + internal static string Cost_TravelLodging { + get { + return ResourceManager.GetString("Cost_TravelLodging", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Per Diems. + /// + internal static string Cost_TravelPerDiem { + get { + return ResourceManager.GetString("Cost_TravelPerDiem", resourceCulture); + } + } + /// /// Looks up a localized string similar to Unforeseen. /// diff --git a/Logic/Resources/Logic.Financial.FinancialAccount.resx b/Logic/Resources/Logic.Financial.FinancialAccount.resx index 4c705ec3..9ac47d24 100644 --- a/Logic/Resources/Logic.Financial.FinancialAccount.resx +++ b/Logic/Resources/Logic.Financial.FinancialAccount.resx @@ -146,6 +146,9 @@ Accounting Errors Used to compensate for all kinds of random mistakes + + Airfare, Airports, and Transit + Allocated Funds @@ -156,7 +159,7 @@ Asset Depreciation - Financial Fees + Bank Fees Bitcoin Miner Fees @@ -168,22 +171,41 @@ Conferences + + Financial fees + Master account to bitcoin mining and bank fees + Forex Capital Losses "Forex" here is short for "Foreign Currency Exchange Rate". May include bitcoin. + + Hospitality + ICT and Infrastructure Interest Losses + + Legal fees + Marketing and Campaigns + + Office Equipment + Offices + + Office Space & Maintenance + + + Public Transit + Research and Development @@ -207,9 +229,25 @@ Taxes + + Taxi, Limo, etc + + + Trains and Ferries + Transportation + + Travel + Root account for travel related accounts + + + Lodging + + + Per Diems + Unforeseen diff --git a/Logic/Structure/Organization.cs b/Logic/Structure/Organization.cs index 55186c7d..b0cb4f50 100644 --- a/Logic/Structure/Organization.cs +++ b/Logic/Structure/Organization.cs @@ -462,18 +462,8 @@ 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); - //FinancialAccounts[OrganizationFinancialAccountType.AssetsPaypal] = - // FinancialAccount.Create(this, "Paypal Account", FinancialAccountType.Asset, null); - //FinancialAccounts[OrganizationFinancialAccountType.AssetsBitcoinHot] = - // FinancialAccount.Create(this, "Bitcoin Holdings (Hot)", FinancialAccountType.Asset, null); - //FinancialAccounts[OrganizationFinancialAccountType.AssetsBitcoinCold] = - // FinancialAccount.Create(this, "Bitcoin Cold Storage", FinancialAccountType.Asset, null); - //FinancialAccounts[OrganizationFinancialAccountType.AssetsVatInbound] = - // FinancialAccount.Create(this, "Inbound Value Added Tax", FinancialAccountType.Asset, null); FinancialAccounts[OrganizationFinancialAccountType.CostsAllocatedFunds] = FinancialAccount.Create (this, "[LOC]Cost_AllocatedFunds", FinancialAccountType.Cost, null); - FinancialAccounts[OrganizationFinancialAccountType.CostsBankFees] = - FinancialAccount.Create (this, "[LOC]Cost_BankFees", FinancialAccountType.Cost, null); FinancialAccounts[OrganizationFinancialAccountType.CostsInfrastructure] = FinancialAccount.Create (this, "[LOC]Cost_IctInfrastructure", FinancialAccountType.Cost, null); FinancialAccounts[OrganizationFinancialAccountType.CostsYearlyResult] = @@ -490,23 +480,39 @@ namespace Swarmops.Logic.Structure FinancialAccount.Create (this, "[LOC]Debt_SalariesDue", FinancialAccountType.Debt, null); FinancialAccounts[OrganizationFinancialAccountType.DebtsTax] = FinancialAccount.Create (this, "[LOC]Debt_Taxes", FinancialAccountType.Debt, null); - //FinancialAccounts[OrganizationFinancialAccountType.DebtsVatOutbound] = - // FinancialAccount.Create(this, "Outbound Value Added Tax", FinancialAccountType.Debt, null); + + FinancialAccount financialFeesMaster = FinancialAccount.Create(this, "[LOC]Cost_FinancialFees", + FinancialAccountType.Cost, null); + FinancialAccounts[OrganizationFinancialAccountType.CostsBankFees] = + FinancialAccount.Create(this, "[LOC]Cost_BankFees", FinancialAccountType.Cost, financialFeesMaster); + FinancialAccounts[OrganizationFinancialAccountType.CostsBitcoinFees] = + FinancialAccount.Create(this, "[LOC]Cost_BitcoinFees", FinancialAccountType.Cost, financialFeesMaster); FinancialAccounts[OrganizationFinancialAccountType.IncomeDonations] = FinancialAccount.Create (this, "[LOC]Income_Donations", FinancialAccountType.Income, null); FinancialAccounts[OrganizationFinancialAccountType.IncomeSales] = FinancialAccount.Create (this, "[LOC]Income_Sales", FinancialAccountType.Income, null); - // Then, create various cost accounts that are probably needed, or that could be used as a starting point - FinancialAccount.Create (this, "[LOC]Cost_Offices", FinancialAccountType.Cost, null); + FinancialAccount officeMaster = FinancialAccount.Create (this, "[LOC]Cost_Offices", FinancialAccountType.Cost, null); + FinancialAccount.Create (this, "[LOC]Cost_OfficeSpace", FinancialAccountType.Cost, officeMaster); + FinancialAccount.Create (this, "[LOC]Cost_OfficeEquipment", FinancialAccountType.Cost, officeMaster); + FinancialAccount.Create (this, "[LOC]Cost_Unforeseen", FinancialAccountType.Cost, null); FinancialAccount.Create (this, "[LOC]Cost_Staff", FinancialAccountType.Cost, null); FinancialAccount.Create (this, "[LOC]Cost_MarketingCampaigns", FinancialAccountType.Cost, null); FinancialAccount.Create (this, "[LOC]Cost_ResearchDevelopment", FinancialAccountType.Cost, null); + FinancialAccount travelMaster = FinancialAccount.Create (this, "[LOC]Cost_Travel", FinancialAccountType.Cost, + null); + FinancialAccount.Create(this, "[LOC]Cost_Airfare", FinancialAccountType.Cost, travelMaster); + FinancialAccount.Create(this, "[LOC]Cost_TaxiTransport", FinancialAccountType.Cost, travelMaster); + FinancialAccount.Create(this, "[LOC]Cost_PublicTransit", FinancialAccountType.Cost, travelMaster); + FinancialAccount.Create(this, "[LOC]Cost_TravelLodging", FinancialAccountType.Cost, travelMaster); + FinancialAccount.Create(this, "[LOC]Cost_TrainsFerries", FinancialAccountType.Cost, travelMaster); + FinancialAccount.Create(this, "[LOC]Cost_TravelPerDiem", FinancialAccountType.Cost, travelMaster); + // Finally, create the first conference parent FinancialAccount conferenceBase = FinancialAccount.Create (this, "[LOC]Cost_Conferences",