From 5f8efa169d165acd00df6254fd797c472466d01b Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 19 Mar 2015 22:49:21 +0100 Subject: [PATCH] Localizabled financial account names --- .../FinancialAccountNames.Designer.cs | 423 ++++++++++++++++++ .../FinancialAccountNames.resx | 247 ++++++++++ Logic/Financial/FinancialAccount.cs | 17 +- Logic/Logic.csproj | 9 + Logic/Structure/Organization.cs | 42 +- .../App_GlobalResources/Pages.Financial.resx | 4 + Site5/App_GlobalResources/Pages.Ledgers.resx | 45 ++ Site5/Controls/v5/Financial/ComboBudgets.ascx | 3 - Site5/Pages/v5/Admin/OrgSettings.aspx.cs | 14 +- .../Pages/v5/Ledgers/BalanceTransactions.aspx | 41 +- .../v5/Ledgers/BalanceTransactions.aspx.cs | 9 + 11 files changed, 811 insertions(+), 43 deletions(-) create mode 100644 Logic/App_GlobalResources/FinancialAccountNames.Designer.cs create mode 100644 Logic/App_GlobalResources/FinancialAccountNames.resx diff --git a/Logic/App_GlobalResources/FinancialAccountNames.Designer.cs b/Logic/App_GlobalResources/FinancialAccountNames.Designer.cs new file mode 100644 index 00000000..d9ff68df --- /dev/null +++ b/Logic/App_GlobalResources/FinancialAccountNames.Designer.cs @@ -0,0 +1,423 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.18444 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Swarmops.Logic.App_GlobalResources { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class FinancialAccountNames { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal FinancialAccountNames() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Swarmops.Logic.App_GlobalResources.FinancialAccountNames", typeof(FinancialAccountNames).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Bank Account. + /// + internal static string Asset_BankAccount { + get { + return ResourceManager.GetString("Asset_BankAccount", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bitcoin Cold Storage. + /// + internal static string Asset_BitcoinCold { + get { + return ResourceManager.GetString("Asset_BitcoinCold", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bitcoin Hot Wallet. + /// + internal static string Asset_BitcoinHot { + get { + return ResourceManager.GetString("Asset_BitcoinHot", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cash Advances. + /// + internal static string Asset_CashAdvances { + get { + return ResourceManager.GetString("Asset_CashAdvances", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Hardware, Machinery, etc.. + /// + internal static string Asset_Hardware { + get { + return ResourceManager.GetString("Asset_Hardware", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Inbound VAT. + /// + internal static string Asset_InboundVat { + get { + return ResourceManager.GetString("Asset_InboundVat", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Outbound Invoices. + /// + internal static string Asset_OutboundInvoices { + get { + return ResourceManager.GetString("Asset_OutboundInvoices", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Paypal Account. + /// + internal static string Asset_Paypal { + get { + return ResourceManager.GetString("Asset_Paypal", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Accounting Errors. + /// + internal static string Cost_AccountingErrors { + get { + return ResourceManager.GetString("Cost_AccountingErrors", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Allocated Funds. + /// + internal static string Cost_AllocatedFunds { + get { + return ResourceManager.GetString("Cost_AllocatedFunds", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Annual Profit/Loss. + /// + internal static string Cost_AnnualResult { + get { + return ResourceManager.GetString("Cost_AnnualResult", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Asset Depreciation. + /// + internal static string Cost_AssetDepreciation { + get { + return ResourceManager.GetString("Cost_AssetDepreciation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bank Fees. + /// + internal static string Cost_BankFees { + get { + return ResourceManager.GetString("Cost_BankFees", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cent Rounding. + /// + internal static string Cost_CentRounding { + get { + return ResourceManager.GetString("Cost_CentRounding", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Conferences. + /// + internal static string Cost_Conferences { + get { + return ResourceManager.GetString("Cost_Conferences", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Forex Holding Losses. + /// + internal static string Cost_ForexLosses { + get { + return ResourceManager.GetString("Cost_ForexLosses", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ICT and Infrastructure. + /// + internal static string Cost_IctInfrastructure { + get { + return ResourceManager.GetString("Cost_IctInfrastructure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Interest Losses. + /// + internal static string Cost_InterestLosses { + get { + return ResourceManager.GetString("Cost_InterestLosses", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Marketing and Campaigns. + /// + internal static string Cost_MarketingCampaigns { + get { + return ResourceManager.GetString("Cost_MarketingCampaigns", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Offices. + /// + internal static string Cost_Offices { + get { + return ResourceManager.GetString("Cost_Offices", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Research and Development. + /// + internal static string Cost_ResearchDevelopment { + get { + return ResourceManager.GetString("Cost_ResearchDevelopment", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Staff. + /// + internal static string Cost_Staff { + get { + return ResourceManager.GetString("Cost_Staff", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Staff Expenses. + /// + internal static string Cost_StaffExpenses { + get { + return ResourceManager.GetString("Cost_StaffExpenses", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Staff Salaries. + /// + internal static string Cost_StaffSalaries { + get { + return ResourceManager.GetString("Cost_StaffSalaries", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Transportation. + /// + internal static string Cost_Transportation { + get { + return ResourceManager.GetString("Cost_Transportation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unforeseen. + /// + internal static string Cost_Unforeseen { + get { + return ResourceManager.GetString("Cost_Unforeseen", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Equity. + /// + internal static string Debt_Equity { + get { + return ResourceManager.GetString("Debt_Equity", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Restricted Equity. + /// + internal static string Debt_EquityRestricted { + get { + return ResourceManager.GetString("Debt_EquityRestricted", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unrestricted Equity. + /// + internal static string Debt_EquityUnrestricted { + get { + return ResourceManager.GetString("Debt_EquityUnrestricted", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Expense Claims. + /// + internal static string Debt_ExpenseClaims { + get { + return ResourceManager.GetString("Debt_ExpenseClaims", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to General Debt. + /// + internal static string Debt_General { + get { + return ResourceManager.GetString("Debt_General", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Inbound Invoices. + /// + internal static string Debt_InboundInvoices { + get { + return ResourceManager.GetString("Debt_InboundInvoices", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Outbound VAT. + /// + internal static string Debt_OutboundVat { + get { + return ResourceManager.GetString("Debt_OutboundVat", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Salaries Due. + /// + internal static string Debt_Salaries { + get { + return ResourceManager.GetString("Debt_Salaries", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Taxes Due. + /// + internal static string Debt_Taxes { + get { + return ResourceManager.GetString("Debt_Taxes", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Donations. + /// + internal static string Income_Donations { + get { + return ResourceManager.GetString("Income_Donations", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Forex Holding Gains. + /// + internal static string Income_ForexGains { + get { + return ResourceManager.GetString("Income_ForexGains", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Interest Gains. + /// + internal static string Income_InterestGains { + get { + return ResourceManager.GetString("Income_InterestGains", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Membership Dues. + /// + internal static string Income_MembershipDues { + get { + return ResourceManager.GetString("Income_MembershipDues", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sales. + /// + internal static string Income_Sales { + get { + return ResourceManager.GetString("Income_Sales", resourceCulture); + } + } + } +} diff --git a/Logic/App_GlobalResources/FinancialAccountNames.resx b/Logic/App_GlobalResources/FinancialAccountNames.resx new file mode 100644 index 00000000..73c4a032 --- /dev/null +++ b/Logic/App_GlobalResources/FinancialAccountNames.resx @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bank Account + + + Bitcoin Cold Storage + + + Bitcoin Hot Wallet + + + Cash Advances + + + Hardware, Machinery, etc. + + + Inbound VAT + Value Added Tax + + + Outbound Invoices + + + Paypal Account + + + Accounting Errors + Used to compensate for all kinds of random mistakes + + + Allocated Funds + + + Annual Profit/Loss + + + Asset Depreciation + + + Bank Fees + + + Cent Rounding + As in rounding to nearest small unit of currency + + + Conferences + + + Forex Holding Losses + "Forex" here is short for "Foreign Currency Exchange Rate". May include bitcoin. + + + ICT and Infrastructure + + + Interest Losses + + + Marketing and Campaigns + + + Offices + + + Research and Development + + + Staff + + + Staff Expenses + + + Staff Salaries + + + Transportation + + + Unforeseen + + + Equity + + + Restricted Equity + As in "equity sold to shareholders" + + + Unrestricted Equity + + + Expense Claims + + + General Debt + + + Inbound Invoices + + + Outbound VAT + Value Added Tax + + + Salaries Due + + + Taxes Due + + + Donations + + + Forex Holding Gains + "Forex" here is short for "Foreign Currency Exchange Rate". May include bitcoin. + + + Interest Gains + + + Membership Dues + + + Sales + + \ No newline at end of file diff --git a/Logic/Financial/FinancialAccount.cs b/Logic/Financial/FinancialAccount.cs index 27b0991c..5f9ab673 100644 --- a/Logic/Financial/FinancialAccount.cs +++ b/Logic/Financial/FinancialAccount.cs @@ -90,6 +90,8 @@ namespace Swarmops.Logic.Financial } + + public bool IsConferenceParent { get @@ -282,7 +284,20 @@ namespace Swarmops.Logic.Financial public new string Name { - get { return base.Name; } + get + { + if (base.Name.StartsWith ("[LOC]")) + { + string localized = App_GlobalResources.FinancialAccountNames.ResourceManager.GetString (base.Name.Substring (5)); + + if (!string.IsNullOrEmpty (localized)) + { + return localized; // We return the localized string only if the lookup succeeds. Otherwise, the raw "[LOC]whatever" will be returned. + } + } + + return base.Name; + } set { try diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj index e45c3713..4c5bc2c5 100644 --- a/Logic/Logic.csproj +++ b/Logic/Logic.csproj @@ -72,6 +72,11 @@ + + True + True + FinancialAccountNames.resx + True True @@ -417,6 +422,10 @@ + + ResXFileCodeGenerator + FinancialAccountNames.Designer.cs + diff --git a/Logic/Structure/Organization.cs b/Logic/Structure/Organization.cs index 84f69454..e73aee9e 100644 --- a/Logic/Structure/Organization.cs +++ b/Logic/Structure/Organization.cs @@ -437,11 +437,11 @@ namespace Swarmops.Logic.Structure // TODO: Set names according to org default culture FinancialAccounts[OrganizationFinancialAccountType.AssetsBankAccountMain] = - FinancialAccount.Create (this, "Bank Account", FinancialAccountType.Asset, null); + FinancialAccount.Create (this, "[LOC]Asset_BankAccount", FinancialAccountType.Asset, null); FinancialAccounts[OrganizationFinancialAccountType.AssetsOutboundInvoices] = - FinancialAccount.Create (this, "Outbound Invoices", FinancialAccountType.Asset, null); + FinancialAccount.Create (this, "[LOC]Asset_OutboundInvoices", FinancialAccountType.Asset, null); FinancialAccounts[OrganizationFinancialAccountType.AssetsOutstandingCashAdvances] = - FinancialAccount.Create (this, "Cash Advances", FinancialAccountType.Asset, null); + FinancialAccount.Create (this, "[LOC]Asset_CashAdvances", FinancialAccountType.Asset, null); //FinancialAccounts[OrganizationFinancialAccountType.AssetsPaypal] = // FinancialAccount.Create(this, "Paypal Account", FinancialAccountType.Asset, null); //FinancialAccounts[OrganizationFinancialAccountType.AssetsBitcoinHot] = @@ -451,45 +451,45 @@ namespace Swarmops.Logic.Structure //FinancialAccounts[OrganizationFinancialAccountType.AssetsVatInbound] = // FinancialAccount.Create(this, "Inbound Value Added Tax", FinancialAccountType.Asset, null); FinancialAccounts[OrganizationFinancialAccountType.CostsAllocatedFunds] = - FinancialAccount.Create (this, "Allocated funds", FinancialAccountType.Cost, null); + FinancialAccount.Create (this, "[LOC]Cost_AllocatedFunds", FinancialAccountType.Cost, null); FinancialAccounts[OrganizationFinancialAccountType.CostsBankFees] = - FinancialAccount.Create (this, "Bank Fees", FinancialAccountType.Cost, null); + FinancialAccount.Create (this, "[LOC]Cost_BankFees", FinancialAccountType.Cost, null); FinancialAccounts[OrganizationFinancialAccountType.CostsInfrastructure] = - FinancialAccount.Create (this, "ICT and Infrastructure", FinancialAccountType.Cost, null); + FinancialAccount.Create (this, "[LOC]Cost_IctInfrastructure", FinancialAccountType.Cost, null); FinancialAccounts[OrganizationFinancialAccountType.CostsYearlyResult] = - FinancialAccount.Create (this, "Yearly result", FinancialAccountType.Cost, null); + FinancialAccount.Create (this, "[LOC]Cost_YearlyResult", FinancialAccountType.Cost, null); FinancialAccounts[OrganizationFinancialAccountType.DebtsEquity] = - FinancialAccount.Create (this, "Equity", FinancialAccountType.Debt, null); + FinancialAccount.Create (this, "[LOC]Debt_Equity", FinancialAccountType.Debt, null); FinancialAccounts[OrganizationFinancialAccountType.DebtsExpenseClaims] = - FinancialAccount.Create (this, "Expense Claims", FinancialAccountType.Debt, null); + FinancialAccount.Create (this, "[LOC]Debt_ExpenseClaims", FinancialAccountType.Debt, null); FinancialAccounts[OrganizationFinancialAccountType.DebtsInboundInvoices] = - FinancialAccount.Create (this, "Inbound Invoices", FinancialAccountType.Debt, null); + FinancialAccount.Create (this, "[LOC]Debt_InboundInvoices", FinancialAccountType.Debt, null); FinancialAccounts[OrganizationFinancialAccountType.DebtsOther] = - FinancialAccount.Create (this, "General Debt", FinancialAccountType.Debt, null); + FinancialAccount.Create (this, "[LOC]Debt_General", FinancialAccountType.Debt, null); FinancialAccounts[OrganizationFinancialAccountType.DebtsSalary] = - FinancialAccount.Create (this, "Salaries Due", FinancialAccountType.Debt, null); + FinancialAccount.Create (this, "[LOC]Debt_SalariesDue", FinancialAccountType.Debt, null); FinancialAccounts[OrganizationFinancialAccountType.DebtsTax] = - FinancialAccount.Create (this, "Taxes Due", FinancialAccountType.Debt, null); + FinancialAccount.Create (this, "[LOC]Debt_Taxes", FinancialAccountType.Debt, null); //FinancialAccounts[OrganizationFinancialAccountType.DebtsVatOutbound] = // FinancialAccount.Create(this, "Outbound Value Added Tax", FinancialAccountType.Debt, null); FinancialAccounts[OrganizationFinancialAccountType.IncomeDonations] = - FinancialAccount.Create (this, "Donations", FinancialAccountType.Income, null); + FinancialAccount.Create (this, "[LOC]Income_Donations", FinancialAccountType.Income, null); FinancialAccounts[OrganizationFinancialAccountType.IncomeSales] = - FinancialAccount.Create (this, "Sales", FinancialAccountType.Income, null); + 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, "Offices", FinancialAccountType.Cost, null); - FinancialAccount.Create (this, "Unforeseen", FinancialAccountType.Cost, null); - FinancialAccount.Create (this, "Staff", FinancialAccountType.Cost, null); - FinancialAccount.Create (this, "Marketing and Campaigns", FinancialAccountType.Cost, null); - FinancialAccount.Create (this, "Research and Development", FinancialAccountType.Cost, null); + FinancialAccount.Create (this, "[LOC]Cost_Offices", FinancialAccountType.Cost, null); + 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); // Finally, create the first conference parent - FinancialAccount conferenceBase = FinancialAccount.Create (this, "Conferences", + FinancialAccount conferenceBase = FinancialAccount.Create (this, "[LOC]Cost_Conferences", FinancialAccountType.Cost, null); conferenceBase.IsConferenceParent = true; diff --git a/Site5/App_GlobalResources/Pages.Financial.resx b/Site5/App_GlobalResources/Pages.Financial.resx index 9973baba..b962e47b 100644 --- a/Site5/App_GlobalResources/Pages.Financial.resx +++ b/Site5/App_GlobalResources/Pages.Financial.resx @@ -329,6 +329,10 @@ These are the various forms of costs to the organization that have passed all the hurdles for payout. They are ready to be paid out to the recipient. Here is where you check them off as being paid out (probably while having your bank open in another window). + + Show open, unmatched payouts ({0:N0}) + These are payouts that have been ordered, but aren't yet mapped to actual transactions. Can be shown for the purpose of undoing them if they were wrong. + Pay Out Money diff --git a/Site5/App_GlobalResources/Pages.Ledgers.resx b/Site5/App_GlobalResources/Pages.Ledgers.resx index e4f9cec6..931347aa 100644 --- a/Site5/App_GlobalResources/Pages.Ledgers.resx +++ b/Site5/App_GlobalResources/Pages.Ledgers.resx @@ -700,4 +700,49 @@ Balance & Match Transactions + + Exact matches for this amount + + + Matching amount, off in time + + + Amount Within 5% Tolerance + + + Balance + + + Match + + + Balance the difference against this account: + + + The transaction matches this payout: + + + Transaction is unbalanced by <span id="spanTransactionUnbalancedBy">+FOO,BAR.QX</span>. Do you wish to... + + + Balance this transaction manually against an account? + + + Match the transaction difference to an open, unmatched payout? + + + (No open payouts) + + + (No suitable payouts to match) + + + Amount Within 1% Tolerance + + + -- Select a Payout -- + + + Amount Within 10% Tolerance + \ No newline at end of file diff --git a/Site5/Controls/v5/Financial/ComboBudgets.ascx b/Site5/Controls/v5/Financial/ComboBudgets.ascx index 0f7de2bf..44f20b76 100644 --- a/Site5/Controls/v5/Financial/ComboBudgets.ascx +++ b/Site5/Controls/v5/Financial/ComboBudgets.ascx @@ -21,9 +21,6 @@ }%> }, onSelect: function(account) { - console.log(account); - - <% if (!String.IsNullOrEmpty(this.OnClientSelect)) { diff --git a/Site5/Pages/v5/Admin/OrgSettings.aspx.cs b/Site5/Pages/v5/Admin/OrgSettings.aspx.cs index 1c1cd3d1..fa20a4f5 100644 --- a/Site5/Pages/v5/Admin/OrgSettings.aspx.cs +++ b/Site5/Pages/v5/Admin/OrgSettings.aspx.cs @@ -168,7 +168,7 @@ namespace Swarmops.Frontend.Pages.v5.Admin FinancialAccount coldAccount = authData.CurrentOrganization.FinancialAccounts.AssetsBitcoinCold; if (coldAccount == null) { - coldAccount = FinancialAccount.Create (authData.CurrentOrganization, "Bitcoin Assets Cold", + coldAccount = FinancialAccount.Create (authData.CurrentOrganization, "[LOC]Asset_BitcoinCold", FinancialAccountType.Asset, null); FinancialAccount.Create (authData.CurrentOrganization, "Cold Address 1", FinancialAccountType.Asset, coldAccount); @@ -197,7 +197,7 @@ namespace Swarmops.Frontend.Pages.v5.Admin if (hotAccount == null) { authData.CurrentOrganization.FinancialAccounts.AssetsBitcoinHot = - FinancialAccount.Create (authData.CurrentOrganization, "Bitcoin Wallet Hot", + FinancialAccount.Create (authData.CurrentOrganization, "[LOC]Asset_BitcoinHot", FinancialAccountType.Asset, null); result.DisplayMessage = @@ -222,10 +222,10 @@ namespace Swarmops.Frontend.Pages.v5.Admin } authData.CurrentOrganization.FinancialAccounts.IncomeCurrencyFluctuations = - FinancialAccount.Create (authData.CurrentOrganization, "Forex holding gains", + FinancialAccount.Create (authData.CurrentOrganization, "[LOC]Income_ForexGains", FinancialAccountType.Income, null); authData.CurrentOrganization.FinancialAccounts.CostsCurrencyFluctuations = - FinancialAccount.Create (authData.CurrentOrganization, "Forex holding losses", + FinancialAccount.Create (authData.CurrentOrganization, "[LOC]Cost_ForexLosses", FinancialAccountType.Cost, null); result.DisplayMessage = @@ -270,10 +270,10 @@ namespace Swarmops.Frontend.Pages.v5.Admin } authData.CurrentOrganization.FinancialAccounts.AssetsVatInbound = - FinancialAccount.Create (authData.CurrentOrganization, "Inbound VAT", + FinancialAccount.Create (authData.CurrentOrganization, "[LOC]Asset_InboundVat", FinancialAccountType.Asset, null); authData.CurrentOrganization.FinancialAccounts.DebtsVatOutbound = - FinancialAccount.Create (authData.CurrentOrganization, "Outbound VAT", + FinancialAccount.Create (authData.CurrentOrganization, "[LOC]Debt_OutboundVat", FinancialAccountType.Debt, null); result.DisplayMessage = "Inbound and outbound VAT accounts were created."; @@ -294,7 +294,7 @@ namespace Swarmops.Frontend.Pages.v5.Admin if (assetsPaypal == null) { authData.CurrentOrganization.FinancialAccounts.AssetsPaypal = - FinancialAccount.Create (authData.CurrentOrganization, "Paypal account", + FinancialAccount.Create (authData.CurrentOrganization, "[LOC]Asset_Paypal", FinancialAccountType.Asset, null); result.DisplayMessage = "An account was created for Paypal account tracking."; diff --git a/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx b/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx index 9f407e38..e25acb1f 100644 --- a/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx +++ b/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx @@ -1,6 +1,6 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="BalanceTransactions.aspx.cs" Inherits="Swarmops.Frontend.Pages.v5.Ledgers.BalanceTransactions" %> <%@ Register TagPrefix="Swarmops5" TagName="ComboBudgets" Src="~/Controls/v5/Financial/ComboBudgets.ascx" %> -<%@ Register TagPrefix="Swarmops5" TagName="CurrencyTextBox" Src="~/Controls/v5/Financial/CurrencyTextBox.ascx" %> +<%@ Register TagPrefix="Swarmops5" TagName="DropDown" Src="~/Controls/v5/Base/DropDown.ascx" %> <%@ Register TagPrefix="Swarmops5" TagName="ModalDialog" Src="~/Controls/v5/Base/ModalDialog.ascx" %> @@ -22,7 +22,6 @@ $('input:radio[name="TxOptions"]').change(function() { var pickedButtonName = $(this).val(); - alert(pickedButtonName); $('div.radioOption').slideUp(); $('div#radioOption' + pickedButtonName).slideDown(); }); @@ -90,7 +89,7 @@
​
- +

- Barfoo! +
+ ​
+ +
+
-

-
- Barfoot! -
-

-
- Barerfeet! + diff --git a/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx.cs b/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx.cs index f84dd299..e9a50902 100644 --- a/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx.cs +++ b/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx.cs @@ -34,6 +34,15 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers this.LabelGridHeaderDescription.Text = Resources.Pages.Ledgers.BalanceTransactions_GridHeader_Description; this.LiteralModalHeader.Text = Resources.Pages.Ledgers.BalanceTransactions_ModalHeader; + this.LabelDoYouWishTo.Text = Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_DoYouWishTo; + + this.LabelDescribeBalance.Text = Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_DescribeBalance; + this.LabelRadioBalance.Text = Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_RadioBalance; + this.LiteralButtonBalance.Text = Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_ButtonBalance; + + this.LabelDescribePayout.Text = Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_DescribePayout; + this.LabelRadioPayout.Text = Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_RadioPayout; + this.LiteralButtonPayout.Text = Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_ButtonPayout; } } } \ No newline at end of file