diff --git a/Common/Enums/OrganizationFinancialAccountType.cs b/Common/Enums/OrganizationFinancialAccountType.cs index da5e424b..331a4b01 100644 --- a/Common/Enums/OrganizationFinancialAccountType.cs +++ b/Common/Enums/OrganizationFinancialAccountType.cs @@ -110,7 +110,7 @@ /// /// For a solo entrepreneur - for moving to Equity at EOY /// - DebtsPrivateWithdrawals, + DebtsPrivateDeposits, /// /// Root account for Value Added Tax (outbound) diff --git a/Logic/Financial/OrganizationFinancialAccounts.cs b/Logic/Financial/OrganizationFinancialAccounts.cs index 8915ec08..4236f221 100644 --- a/Logic/Financial/OrganizationFinancialAccounts.cs +++ b/Logic/Financial/OrganizationFinancialAccounts.cs @@ -96,6 +96,12 @@ namespace Swarmops.Logic.Financial set { this[OrganizationFinancialAccountType.AssetsPaypal] = value; } } + public FinancialAccount AssetsPrivateWithdrawals + { + get { return this[OrganizationFinancialAccountType.AssetsPrivateWithdrawals]; } + set { this[OrganizationFinancialAccountType.AssetsPrivateWithdrawals] = value; } + } + public FinancialAccount AssetsVatInbound { get { return this[OrganizationFinancialAccountType.AssetsVatInbound]; } @@ -166,6 +172,12 @@ namespace Swarmops.Logic.Financial get { return this[OrganizationFinancialAccountType.DebtsInboundInvoices]; } } + public FinancialAccount DebtsPrivateDeposits + { + get { return this[OrganizationFinancialAccountType.DebtsPrivateDeposits]; } + set { this[OrganizationFinancialAccountType.DebtsPrivateDeposits] = value; } + } + public FinancialAccount DebtsSalary { get { return this[OrganizationFinancialAccountType.DebtsSalary]; } diff --git a/Logic/Financial/VatReports.cs b/Logic/Financial/VatReports.cs index 25c0b8f9..ad170f73 100644 --- a/Logic/Financial/VatReports.cs +++ b/Logic/Financial/VatReports.cs @@ -48,7 +48,7 @@ namespace Swarmops.Logic.Financial 1); DateTime nextReport = lastReport.AddMonths(reportMonthInterval); - DateTime nextReportGenerationTime = nextReport.AddMonths(reportMonthInterval).AddDays(0); // Make the report on the 4yh after the period has ended + DateTime nextReportGenerationTime = nextReport.AddMonths(reportMonthInterval).AddDays(0); // Make the report on the 4th after the period has ended if (nowUtc > nextReportGenerationTime) { // Create a new report diff --git a/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs b/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs index 636a311d..ed8b6c7f 100644 --- a/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs +++ b/Logic/Resources/Logic.Financial.FinancialAccount.Designer.cs @@ -63,7 +63,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Bank Account. /// - public static string Asset_BankAccount { + internal static string Asset_BankAccount { get { return ResourceManager.GetString("Asset_BankAccount", resourceCulture); } @@ -72,7 +72,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Bank Accounts. /// - public static string Asset_BankAccounts { + internal static string Asset_BankAccounts { get { return ResourceManager.GetString("Asset_BankAccounts", resourceCulture); } @@ -81,7 +81,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Bitcoin Cold Storage. /// - public static string Asset_BitcoinCold { + internal static string Asset_BitcoinCold { get { return ResourceManager.GetString("Asset_BitcoinCold", resourceCulture); } @@ -90,7 +90,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Bitcoin Hot Wallet. /// - public static string Asset_BitcoinHot { + internal static string Asset_BitcoinHot { get { return ResourceManager.GetString("Asset_BitcoinHot", resourceCulture); } @@ -99,7 +99,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Cash Advances. /// - public static string Asset_CashAdvances { + internal static string Asset_CashAdvances { get { return ResourceManager.GetString("Asset_CashAdvances", resourceCulture); } @@ -108,7 +108,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Hardware, Machinery, etc.. /// - public static string Asset_Hardware { + internal static string Asset_Hardware { get { return ResourceManager.GetString("Asset_Hardware", resourceCulture); } @@ -117,7 +117,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Inbound VAT. /// - public static string Asset_InboundVat { + internal static string Asset_InboundVat { get { return ResourceManager.GetString("Asset_InboundVat", resourceCulture); } @@ -126,7 +126,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Surplus inbound VAT in report. /// - public static string Asset_InboundVatReported { + internal static string Asset_InboundVatReported { get { return ResourceManager.GetString("Asset_InboundVatReported", resourceCulture); } @@ -135,7 +135,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Inbound VAT to report. /// - public static string Asset_InboundVatUnreported { + internal static string Asset_InboundVatUnreported { get { return ResourceManager.GetString("Asset_InboundVatUnreported", resourceCulture); } @@ -144,7 +144,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Outbound Invoices. /// - public static string Asset_OutboundInvoices { + internal static string Asset_OutboundInvoices { get { return ResourceManager.GetString("Asset_OutboundInvoices", resourceCulture); } @@ -153,16 +153,25 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Paypal Account. /// - public static string Asset_Paypal { + internal static string Asset_Paypal { get { return ResourceManager.GetString("Asset_Paypal", resourceCulture); } } + /// + /// Looks up a localized string similar to Private Withdrawals. + /// + internal static string Asset_PrivateWithdrawals { + get { + return ResourceManager.GetString("Asset_PrivateWithdrawals", resourceCulture); + } + } + /// /// Looks up a localized string similar to Short Term Assets. /// - public static string Asset_ShortTerm { + internal static string Asset_ShortTerm { get { return ResourceManager.GetString("Asset_ShortTerm", resourceCulture); } @@ -171,7 +180,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Taxes Prepayment. /// - public static string Asset_TaxAdvances { + internal static string Asset_TaxAdvances { get { return ResourceManager.GetString("Asset_TaxAdvances", resourceCulture); } @@ -180,7 +189,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Internal Transfers in Progress. /// - public static string Asset_TransfersInProgress { + internal static string Asset_TransfersInProgress { get { return ResourceManager.GetString("Asset_TransfersInProgress", resourceCulture); } @@ -189,7 +198,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Accounting Errors. /// - public static string Cost_AccountingErrors { + internal static string Cost_AccountingErrors { get { return ResourceManager.GetString("Cost_AccountingErrors", resourceCulture); } @@ -198,7 +207,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Airfare, Airports, and Transit. /// - public static string Cost_Airfare { + internal static string Cost_Airfare { get { return ResourceManager.GetString("Cost_Airfare", resourceCulture); } @@ -207,7 +216,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Business or First Class. /// - public static string Cost_AirfareBusiness { + internal static string Cost_AirfareBusiness { get { return ResourceManager.GetString("Cost_AirfareBusiness", resourceCulture); } @@ -216,7 +225,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Coach. /// - public static string Cost_AirfareCoach { + internal static string Cost_AirfareCoach { get { return ResourceManager.GetString("Cost_AirfareCoach", resourceCulture); } @@ -225,7 +234,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Allocated Funds. /// - public static string Cost_AllocatedFunds { + internal static string Cost_AllocatedFunds { get { return ResourceManager.GetString("Cost_AllocatedFunds", resourceCulture); } @@ -234,7 +243,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Annual Profit/Loss. /// - public static string Cost_AnnualResult { + internal static string Cost_AnnualResult { get { return ResourceManager.GetString("Cost_AnnualResult", resourceCulture); } @@ -243,7 +252,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Asset Depreciation. /// - public static string Cost_AssetDepreciation { + internal static string Cost_AssetDepreciation { get { return ResourceManager.GetString("Cost_AssetDepreciation", resourceCulture); } @@ -252,7 +261,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Bank Fees. /// - public static string Cost_BankFees { + internal static string Cost_BankFees { get { return ResourceManager.GetString("Cost_BankFees", resourceCulture); } @@ -261,7 +270,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Bitcoin Miner Fees. /// - public static string Cost_BitcoinFees { + internal static string Cost_BitcoinFees { get { return ResourceManager.GetString("Cost_BitcoinFees", resourceCulture); } @@ -270,7 +279,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Business Services. /// - public static string Cost_BusinessServices { + internal static string Cost_BusinessServices { get { return ResourceManager.GetString("Cost_BusinessServices", resourceCulture); } @@ -279,7 +288,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Cent Rounding. /// - public static string Cost_CentRounding { + internal static string Cost_CentRounding { get { return ResourceManager.GetString("Cost_CentRounding", resourceCulture); } @@ -288,7 +297,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Conferences (our own). /// - public static string Cost_Conferences { + internal static string Cost_Conferences { get { return ResourceManager.GetString("Cost_Conferences", resourceCulture); } @@ -297,7 +306,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Event Tickets. /// - public static string Cost_EventTickets { + internal static string Cost_EventTickets { get { return ResourceManager.GetString("Cost_EventTickets", resourceCulture); } @@ -306,7 +315,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Financial fees. /// - public static string Cost_FinancialFees { + internal static string Cost_FinancialFees { get { return ResourceManager.GetString("Cost_FinancialFees", resourceCulture); } @@ -315,7 +324,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Forex Capital Losses. /// - public static string Cost_ForexLosses { + internal static string Cost_ForexLosses { get { return ResourceManager.GetString("Cost_ForexLosses", resourceCulture); } @@ -324,7 +333,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Hospitality. /// - public static string Cost_Hospitality { + internal static string Cost_Hospitality { get { return ResourceManager.GetString("Cost_Hospitality", resourceCulture); } @@ -333,7 +342,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to ICT and Infrastructure. /// - public static string Cost_IctInfrastructure { + internal static string Cost_IctInfrastructure { get { return ResourceManager.GetString("Cost_IctInfrastructure", resourceCulture); } @@ -342,7 +351,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Interest Losses. /// - public static string Cost_InterestLosses { + internal static string Cost_InterestLosses { get { return ResourceManager.GetString("Cost_InterestLosses", resourceCulture); } @@ -351,7 +360,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Legal fees. /// - public static string Cost_LegalFees { + internal static string Cost_LegalFees { get { return ResourceManager.GetString("Cost_LegalFees", resourceCulture); } @@ -360,7 +369,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to 5 Star. /// - public static string Cost_LodgingFiveStar { + internal static string Cost_LodgingFiveStar { get { return ResourceManager.GetString("Cost_LodgingFiveStar", resourceCulture); } @@ -369,7 +378,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to 4 Star. /// - public static string Cost_LodgingFourStar { + internal static string Cost_LodgingFourStar { get { return ResourceManager.GetString("Cost_LodgingFourStar", resourceCulture); } @@ -378,7 +387,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Hostel or budget equivalent. /// - public static string Cost_LodgingHostel { + internal static string Cost_LodgingHostel { get { return ResourceManager.GetString("Cost_LodgingHostel", resourceCulture); } @@ -387,7 +396,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Shared lodging (AirBnB etc). /// - public static string Cost_LodgingShared { + internal static string Cost_LodgingShared { get { return ResourceManager.GetString("Cost_LodgingShared", resourceCulture); } @@ -396,7 +405,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to 3 Star. /// - public static string Cost_LodgingThreeStar { + internal static string Cost_LodgingThreeStar { get { return ResourceManager.GetString("Cost_LodgingThreeStar", resourceCulture); } @@ -405,7 +414,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Maintenance Donations. /// - public static string Cost_MaintenanceDonations { + internal static string Cost_MaintenanceDonations { get { return ResourceManager.GetString("Cost_MaintenanceDonations", resourceCulture); } @@ -414,7 +423,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Marketing and Campaigns. /// - public static string Cost_MarketingCampaigns { + internal static string Cost_MarketingCampaigns { get { return ResourceManager.GetString("Cost_MarketingCampaigns", resourceCulture); } @@ -423,7 +432,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Office Equipment. /// - public static string Cost_OfficeEquipment { + internal static string Cost_OfficeEquipment { get { return ResourceManager.GetString("Cost_OfficeEquipment", resourceCulture); } @@ -432,7 +441,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Offices. /// - public static string Cost_Offices { + internal static string Cost_Offices { get { return ResourceManager.GetString("Cost_Offices", resourceCulture); } @@ -441,7 +450,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Office Space, Maintenance. /// - public static string Cost_OfficeSpace { + internal static string Cost_OfficeSpace { get { return ResourceManager.GetString("Cost_OfficeSpace", resourceCulture); } @@ -450,7 +459,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Office Supplies (consumables). /// - public static string Cost_OfficeSupplies { + internal static string Cost_OfficeSupplies { get { return ResourceManager.GetString("Cost_OfficeSupplies", resourceCulture); } @@ -459,7 +468,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Public Transit. /// - public static string Cost_PublicTransit { + internal static string Cost_PublicTransit { get { return ResourceManager.GetString("Cost_PublicTransit", resourceCulture); } @@ -468,7 +477,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Research and Development. /// - public static string Cost_ResearchDevelopment { + internal static string Cost_ResearchDevelopment { get { return ResourceManager.GetString("Cost_ResearchDevelopment", resourceCulture); } @@ -477,7 +486,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Staff. /// - public static string Cost_Staff { + internal static string Cost_Staff { get { return ResourceManager.GetString("Cost_Staff", resourceCulture); } @@ -486,7 +495,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Staff Benefits. /// - public static string Cost_StaffBenefits { + internal static string Cost_StaffBenefits { get { return ResourceManager.GetString("Cost_StaffBenefits", resourceCulture); } @@ -495,7 +504,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Staff Expenses. /// - public static string Cost_StaffExpenses { + internal static string Cost_StaffExpenses { get { return ResourceManager.GetString("Cost_StaffExpenses", resourceCulture); } @@ -504,7 +513,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Staff Per-Diem. /// - public static string Cost_StaffPerDiem { + internal static string Cost_StaffPerDiem { get { return ResourceManager.GetString("Cost_StaffPerDiem", resourceCulture); } @@ -513,7 +522,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Staff Salaries. /// - public static string Cost_StaffSalaries { + internal static string Cost_StaffSalaries { get { return ResourceManager.GetString("Cost_StaffSalaries", resourceCulture); } @@ -522,7 +531,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Taxes. /// - public static string Cost_Taxes { + internal static string Cost_Taxes { get { return ResourceManager.GetString("Cost_Taxes", resourceCulture); } @@ -531,7 +540,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Taxi, Limo, etc. /// - public static string Cost_TaxiTransport { + internal static string Cost_TaxiTransport { get { return ResourceManager.GetString("Cost_TaxiTransport", resourceCulture); } @@ -540,7 +549,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Trains and Ferries. /// - public static string Cost_TrainsFerries { + internal static string Cost_TrainsFerries { get { return ResourceManager.GetString("Cost_TrainsFerries", resourceCulture); } @@ -549,7 +558,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Transportation. /// - public static string Cost_Transportation { + internal static string Cost_Transportation { get { return ResourceManager.GetString("Cost_Transportation", resourceCulture); } @@ -558,7 +567,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Travel. /// - public static string Cost_Travel { + internal static string Cost_Travel { get { return ResourceManager.GetString("Cost_Travel", resourceCulture); } @@ -567,7 +576,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Lodging. /// - public static string Cost_TravelLodging { + internal static string Cost_TravelLodging { get { return ResourceManager.GetString("Cost_TravelLodging", resourceCulture); } @@ -576,7 +585,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Per Diems. /// - public static string Cost_TravelPerDiem { + internal static string Cost_TravelPerDiem { get { return ResourceManager.GetString("Cost_TravelPerDiem", resourceCulture); } @@ -585,7 +594,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Unforeseen. /// - public static string Cost_Unforeseen { + internal static string Cost_Unforeseen { get { return ResourceManager.GetString("Cost_Unforeseen", resourceCulture); } @@ -594,7 +603,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Equity. /// - public static string Debt_Equity { + internal static string Debt_Equity { get { return ResourceManager.GetString("Debt_Equity", resourceCulture); } @@ -603,7 +612,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Restricted Equity. /// - public static string Debt_EquityRestricted { + internal static string Debt_EquityRestricted { get { return ResourceManager.GetString("Debt_EquityRestricted", resourceCulture); } @@ -612,7 +621,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Unrestricted Equity. /// - public static string Debt_EquityUnrestricted { + internal static string Debt_EquityUnrestricted { get { return ResourceManager.GetString("Debt_EquityUnrestricted", resourceCulture); } @@ -621,7 +630,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Expense Claims. /// - public static string Debt_ExpenseClaims { + internal static string Debt_ExpenseClaims { get { return ResourceManager.GetString("Debt_ExpenseClaims", resourceCulture); } @@ -630,7 +639,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to General Debt. /// - public static string Debt_General { + internal static string Debt_General { get { return ResourceManager.GetString("Debt_General", resourceCulture); } @@ -639,7 +648,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Inbound Invoices. /// - public static string Debt_InboundInvoices { + internal static string Debt_InboundInvoices { get { return ResourceManager.GetString("Debt_InboundInvoices", resourceCulture); } @@ -648,7 +657,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Outbound VAT. /// - public static string Debt_OutboundVat { + internal static string Debt_OutboundVat { get { return ResourceManager.GetString("Debt_OutboundVat", resourceCulture); } @@ -657,7 +666,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Reported VAT to pay. /// - public static string Debt_OutboundVatReported { + internal static string Debt_OutboundVatReported { get { return ResourceManager.GetString("Debt_OutboundVatReported", resourceCulture); } @@ -666,16 +675,25 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Outbound VAT to report. /// - public static string Debt_OutboundVatUnreported { + internal static string Debt_OutboundVatUnreported { get { return ResourceManager.GetString("Debt_OutboundVatUnreported", resourceCulture); } } + /// + /// Looks up a localized string similar to Private Deposits. + /// + internal static string Debt_PrivateDeposits { + get { + return ResourceManager.GetString("Debt_PrivateDeposits", resourceCulture); + } + } + /// /// Looks up a localized string similar to Salaries Due. /// - public static string Debt_Salaries { + internal static string Debt_Salaries { get { return ResourceManager.GetString("Debt_Salaries", resourceCulture); } @@ -684,7 +702,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Taxes Due. /// - public static string Debt_Taxes { + internal static string Debt_Taxes { get { return ResourceManager.GetString("Debt_Taxes", resourceCulture); } @@ -693,7 +711,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Donations. /// - public static string Income_Donations { + internal static string Income_Donations { get { return ResourceManager.GetString("Income_Donations", resourceCulture); } @@ -702,7 +720,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Forex Capital Gains. /// - public static string Income_ForexGains { + internal static string Income_ForexGains { get { return ResourceManager.GetString("Income_ForexGains", resourceCulture); } @@ -711,7 +729,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Interest Gains. /// - public static string Income_InterestGains { + internal static string Income_InterestGains { get { return ResourceManager.GetString("Income_InterestGains", resourceCulture); } @@ -720,7 +738,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Membership Dues. /// - public static string Income_MembershipDues { + internal static string Income_MembershipDues { get { return ResourceManager.GetString("Income_MembershipDues", resourceCulture); } @@ -729,7 +747,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Sales. /// - public static string Income_Sales { + internal static string Income_Sales { get { return ResourceManager.GetString("Income_Sales", resourceCulture); } @@ -738,7 +756,7 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Subsidies and Grants. /// - public static string Income_SubsidiesGrants { + internal static string Income_SubsidiesGrants { get { return ResourceManager.GetString("Income_SubsidiesGrants", resourceCulture); } diff --git a/Logic/Resources/Logic.Financial.FinancialAccount.resx b/Logic/Resources/Logic.Financial.FinancialAccount.resx index f9c46ca6..c29b8f7c 100644 --- a/Logic/Resources/Logic.Financial.FinancialAccount.resx +++ b/Logic/Resources/Logic.Financial.FinancialAccount.resx @@ -372,4 +372,10 @@ Maintenance Donations This is donations toward maintenance of the Swarmops / Backoffice.Cash codebase and data. + + Private Withdrawals + + + Private Deposits + \ No newline at end of file diff --git a/Site/Master-v5.master.cs b/Site/Master-v5.master.cs index 5529dbd2..18af0d7d 100644 --- a/Site/Master-v5.master.cs +++ b/Site/Master-v5.master.cs @@ -40,7 +40,19 @@ namespace Swarmops.Frontend // BEGIN TEST CODE - // VatReports.CreateNewReports(); + foreach (FinancialAccount account in FinancialAccounts.ForOrganization(CurrentOrganization)) + { + if (account.Name == "[LOC]Asset_PrivateWithdrawals") + { + CurrentOrganization.FinancialAccounts.AssetsPrivateWithdrawals = account; + } + else if (account.Name == "[LOC]Debt_PrivateDeposits") + { + CurrentOrganization.FinancialAccounts.DebtsPrivateDeposits = account; + } + } + + VatReports.CreateNewReports(); // END TEST CODE diff --git a/Site/Pages/v5/Ledgers/ViewVatReports.aspx b/Site/Pages/v5/Ledgers/ViewVatReports.aspx index b3c6c6c5..cef2864e 100644 --- a/Site/Pages/v5/Ledgers/ViewVatReports.aspx +++ b/Site/Pages/v5/Ledgers/ViewVatReports.aspx @@ -120,6 +120,20 @@ + + + +

diff --git a/Site/Pages/v5/Ledgers/ViewVatReports.aspx.designer.cs b/Site/Pages/v5/Ledgers/ViewVatReports.aspx.designer.cs index 1252062a..076b214f 100644 --- a/Site/Pages/v5/Ledgers/ViewVatReports.aspx.designer.cs +++ b/Site/Pages/v5/Ledgers/ViewVatReports.aspx.designer.cs @@ -156,6 +156,15 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { /// protected global::System.Web.UI.WebControls.Repeater RepeaterLightboxItems; + /// + /// LabelIssueVatReport control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label LabelIssueVatReport; + /// /// LabelSidebarDownload control. ///