diff --git a/Localization/Pages.Financial.Designer.cs b/Localization/Pages.Financial.Designer.cs index 8c4186ec..2682ee71 100644 --- a/Localization/Pages.Financial.Designer.cs +++ b/Localization/Pages.Financial.Designer.cs @@ -564,6 +564,15 @@ namespace Swarmops.Localization { } } + /// + /// Looks up a localized string similar to Invoice Date. + /// + internal static string CreateInboundInvoice_InvoiceDate { + get { + return ResourceManager.GetString("CreateInboundInvoice_InvoiceDate", resourceCulture); + } + } + /// /// Looks up a localized string similar to Received Inbound Invoice. /// diff --git a/Localization/Pages.Financial.resx b/Localization/Pages.Financial.resx index fb1de8a9..e24945d9 100644 --- a/Localization/Pages.Financial.resx +++ b/Localization/Pages.Financial.resx @@ -311,6 +311,10 @@ This is where you file invoices received at your organization ("Accounts Payable"). Enter the supplier name, amount, due date, the invoice reference, and upload an image of the received invoice. Also, select a budget. The budget owner needs to attest, as usual. (Future roadmapped expansions to this mechanism include purchase orders and supplier lists.) + + Invoice Date + This refers to the date as written on the invoice. (It defaults to the date when the invoice is entered, which is usually later.) + Received Inbound Invoice diff --git a/Site/Pages/v5/Financial/CreateInboundInvoice.aspx b/Site/Pages/v5/Financial/CreateInboundInvoice.aspx index 62950910..a6880fa6 100644 --- a/Site/Pages/v5/Financial/CreateInboundInvoice.aspx +++ b/Site/Pages/v5/Financial/CreateInboundInvoice.aspx @@ -145,6 +145,7 @@

+
@@ -167,6 +168,7 @@
+



diff --git a/Site/Pages/v5/Financial/CreateInboundInvoice.aspx.cs b/Site/Pages/v5/Financial/CreateInboundInvoice.aspx.cs index 34e7ae32..804268f0 100644 --- a/Site/Pages/v5/Financial/CreateInboundInvoice.aspx.cs +++ b/Site/Pages/v5/Financial/CreateInboundInvoice.aspx.cs @@ -4,6 +4,7 @@ using System.Drawing; using System.Globalization; using System.Web; using Resources; +using Swarmops.Localization; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; using Swarmops.Logic.Support; @@ -112,21 +113,23 @@ namespace Swarmops.Frontend.Pages.v5.Financial private void Localize() { - this.LabelSupplier.Text = Global.Financial_Supplier; - this.LabelDueDate.Text = Global.Financial_DueDate; - this.LabelAmount.Text = string.Format (Resources.Pages.Financial.CreateInboundInvoice_Amount, + this.LabelInvoiceDate.Text = LocalizedStrings.Get(LocDomain.PagesFinancial, + "CreateInboundInvoice_InvoiceDate"); + this.LabelSupplier.Text = LocalizedStrings.Get(LocDomain.Global, "Financial_Supplier"); + this.LabelDueDate.Text = this.LabelInvoiceDate.Text = LocalizedStrings.Get(LocDomain.Global, "Financial_DueDate"); + this.LabelAmount.Text = string.Format (LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_Amount"), CurrentOrganization.Currency.Code); - this.LabelVat.Text = string.Format(Resources.Pages.Financial.CreateInboundInvoice_AmountVat, + this.LabelVat.Text = string.Format(LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_AmountVat"), CurrentOrganization.Currency.Code); - this.LabelPurpose.Text = Resources.Pages.Financial.CreateInboundInvoice_Description; - this.LabelBudget.Text = Global.Financial_Budget; - this.LabelHeaderBankDetails.Text = Resources.Pages.Financial.CreateInboundInvoice_HeaderPaymentDetails; - this.LabelHeaderImageFiles.Text = Resources.Pages.Financial.CreateInboundInvoice_HeaderInvoiceImage; - this.LabelImageFiles.Text = Resources.Pages.Financial.CreateInboundInvoice_UploadInvoiceImage; - this.LabelReference.Text = Resources.Pages.Financial.CreateInboundInvoice_Reference; - this.LabelAccount.Text = Resources.Pages.Financial.CreateInboundInvoice_SupplierAccount; + this.LabelPurpose.Text = LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_Description"); + this.LabelBudget.Text = LocalizedStrings.Get(LocDomain.Global, "Financial_Budget"); + this.LabelHeaderBankDetails.Text = LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_HeaderPaymentDetails"); + this.LabelHeaderImageFiles.Text = LocalizedStrings.Get(LocDomain.PagesFinancial, "Financial.CreateInboundInvoice_HeaderInvoiceImage"); + this.LabelImageFiles.Text = LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_UploadInvoiceImage"); + this.LabelReference.Text = LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_Reference"); + this.LabelAccount.Text = LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_SupplierAccount"); - this.ButtonCreate.Text = Resources.Pages.Financial.CreateInboundInvoice_ButtonCreate; + this.ButtonCreate.Text = LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_ButtonCreate"); } @@ -233,39 +236,39 @@ namespace Swarmops.Frontend.Pages.v5.Financial } return - JavascriptEscape (String.Format (Resources.Pages.Financial.CreateInboundInvoice_SuccessMessage, + JavascriptEscape (String.Format (LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_SuccessMessage"), this._invoiceId)); } } public string Localized_ValidationError_MissingTag { - get { return JavascriptEscape(Resources.Pages.Financial.CreateInboundInvoice_ValidationError_MissingTag); } + get { return JavascriptEscape(LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_ValidationError_MissingTag")); } } public string Localized_ValidationError_Account { - get { return JavascriptEscape(Resources.Pages.Financial.CreateInboundInvoice_ValidationError_Account); } + get { return JavascriptEscape(LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_ValidationError_Account")); } } public string Localized_ValidationError_Purpose { - get { return JavascriptEscape(Resources.Pages.Financial.CreateInboundInvoice_ValidationError_Purpose); } + get { return JavascriptEscape(LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_ValidationError_Purpose")); } } public string Localized_ValidationError_Budget { - get { return JavascriptEscape(Resources.Pages.Financial.CreateInboundInvoice_ValidationError_Budget); } + get { return JavascriptEscape(LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_ValidationError_Budget")); } } public string Localized_ValidationError_Amount { - get { return JavascriptEscape(Resources.Pages.Financial.CreateInboundInvoice_ValidationError_Amount); } + get { return JavascriptEscape(LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_ValidationError_Amount")); } } public string Localized_ValidationError_Documents { - get { return JavascriptEscape(Resources.Pages.Financial.CreateInboundInvoice_ValidationError_Documents); } + get { return JavascriptEscape(LocalizedStrings.Get(LocDomain.PagesFinancial, "CreateInboundInvoice_ValidationError_Documents")); } } } diff --git a/Site/Pages/v5/Financial/CreateInboundInvoice.aspx.designer.cs b/Site/Pages/v5/Financial/CreateInboundInvoice.aspx.designer.cs index 4f597573..a40c33b1 100644 --- a/Site/Pages/v5/Financial/CreateInboundInvoice.aspx.designer.cs +++ b/Site/Pages/v5/Financial/CreateInboundInvoice.aspx.designer.cs @@ -48,6 +48,15 @@ namespace Swarmops.Frontend.Pages.v5.Financial { /// protected global::System.Web.UI.WebControls.HiddenField HiddenTagSetIdentifiers; + /// + /// TextInvoiceDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox TextInvoiceDate; + /// /// TextSupplier control. /// @@ -147,6 +156,15 @@ namespace Swarmops.Frontend.Pages.v5.Financial { /// protected global::System.Web.UI.WebControls.Button ButtonCreate; + /// + /// LabelInvoiceDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label LabelInvoiceDate; + /// /// LabelSupplier control. ///