diff --git a/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs b/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs
index ef473c88..d545eff6 100644
--- a/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs
+++ b/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs
@@ -150,6 +150,24 @@ namespace Swarmops.Logic.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Business or First Class.
+ ///
+ internal static string Cost_AirfareBusiness {
+ get {
+ return ResourceManager.GetString("Cost_AirfareBusiness", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Coach.
+ ///
+ internal static string Cost_AirfareCoach {
+ get {
+ return ResourceManager.GetString("Cost_AirfareCoach", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Allocated Funds.
///
@@ -205,7 +223,7 @@ namespace Swarmops.Logic.Resources {
}
///
- /// Looks up a localized string similar to Conferences.
+ /// Looks up a localized string similar to Conferences (our own).
///
internal static string Cost_Conferences {
get {
@@ -276,6 +294,51 @@ namespace Swarmops.Logic.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to 5 Star.
+ ///
+ internal static string Cost_LodgingFiveStar {
+ get {
+ return ResourceManager.GetString("Cost_LodgingFiveStar", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 4 Star.
+ ///
+ internal static string Cost_LodgingFourStar {
+ get {
+ return ResourceManager.GetString("Cost_LodgingFourStar", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Hostel or budget equivalent.
+ ///
+ internal static string Cost_LodgingHostel {
+ get {
+ return ResourceManager.GetString("Cost_LodgingHostel", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Shared lodging (AirBnB etc).
+ ///
+ internal static string Cost_LodgingShared {
+ get {
+ return ResourceManager.GetString("Cost_LodgingShared", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 3 Star.
+ ///
+ internal static string Cost_LodgingThreeStar {
+ get {
+ return ResourceManager.GetString("Cost_LodgingThreeStar", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Marketing and Campaigns.
///
@@ -304,7 +367,7 @@ namespace Swarmops.Logic.Resources {
}
///
- /// Looks up a localized string similar to Office Space & Maintenance.
+ /// Looks up a localized string similar to Office Space, Maintenance.
///
internal static string Cost_OfficeSpace {
get {
diff --git a/Logic/Resources/Logic.Financial.FinancialAccount.resx b/Logic/Resources/Logic.Financial.FinancialAccount.resx
index eea1ab90..77e19c4f 100644
--- a/Logic/Resources/Logic.Financial.FinancialAccount.resx
+++ b/Logic/Resources/Logic.Financial.FinancialAccount.resx
@@ -150,6 +150,12 @@
Airfare, Airports, and Transit
"Transit" refers to transit to/from airport.
+
+ Business or First Class
+
+
+ Coach
+
Allocated Funds
@@ -170,7 +176,8 @@
As in rounding to nearest small unit of currency
- Conferences
+ Conferences (our own)
+ This is for confs that the organization is _hosting_.
Event Tickets
@@ -196,6 +203,24 @@
Legal fees
+
+ 5 Star
+ Five-star rating
+
+
+ 4 Star
+ Four-star rating
+
+
+ Hostel or budget equivalent
+
+
+ Shared lodging (AirBnB etc)
+
+
+ 3 Star
+ Three-star rating
+
Marketing and Campaigns
@@ -206,7 +231,7 @@
Offices
- Office Space & Maintenance
+ Office Space, Maintenance
Public Transit
diff --git a/Logic/Structure/Organization.cs b/Logic/Structure/Organization.cs
index f011caa3..b699679c 100644
--- a/Logic/Structure/Organization.cs
+++ b/Logic/Structure/Organization.cs
@@ -506,10 +506,17 @@ namespace Swarmops.Logic.Structure
FinancialAccount travelMaster = FinancialAccount.Create (this, "[LOC]Cost_Travel", FinancialAccountType.Cost,
null);
- FinancialAccount.Create(this, "[LOC]Cost_Airfare", FinancialAccountType.Cost, travelMaster);
+ FinancialAccount airfare = FinancialAccount.Create(this, "[LOC]Cost_Airfare", FinancialAccountType.Cost, travelMaster);
+ FinancialAccount.Create(this, "[LOC]Cost_AirfareBusiness", FinancialAccountType.Cost, airfare);
+ FinancialAccount.Create(this, "[LOC]Cost_AirfareCoach", FinancialAccountType.Cost, airfare);
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 lodging = FinancialAccount.Create(this, "[LOC]Cost_TravelLodging", FinancialAccountType.Cost, travelMaster);
+ FinancialAccount.Create(this, "[LOC]Cost_LodgingHostel", FinancialAccountType.Cost, lodging);
+ FinancialAccount.Create(this, "[LOC]Cost_LodgingShared", FinancialAccountType.Cost, lodging);
+ FinancialAccount.Create(this, "[LOC]Cost_LodgingThreeStar", FinancialAccountType.Cost, lodging);
+ FinancialAccount.Create(this, "[LOC]Cost_LodgingFourStar", FinancialAccountType.Cost, lodging);
+ FinancialAccount.Create(this, "[LOC]Cost_LodgingFiveStar", FinancialAccountType.Cost, lodging);
FinancialAccount.Create(this, "[LOC]Cost_TrainsFerries", FinancialAccountType.Cost, travelMaster);
FinancialAccount.Create(this, "[LOC]Cost_TravelPerDiem", FinancialAccountType.Cost, travelMaster);
FinancialAccount.Create(this, "[LOC]Cost_EventTickets", FinancialAccountType.Cost, travelMaster);