diff --git a/Site5/App_GlobalResources/Global.resx b/Site5/App_GlobalResources/Global.resx
index 01e71c64..36a778ce 100644
--- a/Site5/App_GlobalResources/Global.resx
+++ b/Site5/App_GlobalResources/Global.resx
@@ -360,4 +360,15 @@
Image {0} of {1}
+
+ Due Date
+ For invoices and similar
+
+
+ Supplier
+
+
+ English (US)
+ Replace with THIS language, EXPRESSED IN this language. Examples: "Español", "Français", "Svenska", etc.
+
\ No newline at end of file
diff --git a/Site5/App_GlobalResources/Pages.Financial.resx b/Site5/App_GlobalResources/Pages.Financial.resx
index 84d20b57..4051d403 100644
--- a/Site5/App_GlobalResources/Pages.Financial.resx
+++ b/Site5/App_GlobalResources/Pages.Financial.resx
@@ -190,6 +190,45 @@
Salary #{0} for {1} was DE-attested. It will not be paid out unless attested again.When somebody undoes a previous attestation.
+
+ Invoice amount (in {0})
+ {0} is the organization's main currency.
+
+
+ Description
+ Free-text description of invoice
+
+
+ Invoice Image
+
+
+ Payment Details
+ Displayed as header over supplier's account details
+
+
+ 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.)
+
+
+ Received Inbound Invoice
+
+
+ Invoice reference
+
+
+ OCR / Automatic
+ Some invoices come with OCR numbers printed on them for automatic processing.
+
+
+ Manual
+ Other invoices come without automated processing and a manual
+
+
+ Account
+ Free text input, intended to convey everything needed to get the money right
+
+
+ Upload image file
+
Expense claim amount (in {0}){0} is the currency.
diff --git a/Site5/Controls/v5/Base/FileUpload.ascx.cs b/Site5/Controls/v5/Base/FileUpload.ascx.cs
index 011cf332..8ec00c0d 100644
--- a/Site5/Controls/v5/Base/FileUpload.ascx.cs
+++ b/Site5/Controls/v5/Base/FileUpload.ascx.cs
@@ -29,7 +29,7 @@ namespace Swarmops.Controls.Base
}
public string GuidString;
- public UploadFilter Filter;
+ public UploadFilter Filter { get; set; }
public enum UploadFilter
diff --git a/Site5/Images/PageIcons/iconshock-invoice-16px.png b/Site5/Images/PageIcons/iconshock-invoice-16px.png
new file mode 100644
index 00000000..052a801e
Binary files /dev/null and b/Site5/Images/PageIcons/iconshock-invoice-16px.png differ
diff --git a/Site5/Images/PageIcons/iconshock-invoice-40px.png b/Site5/Images/PageIcons/iconshock-invoice-40px.png
new file mode 100644
index 00000000..51e6b5fa
Binary files /dev/null and b/Site5/Images/PageIcons/iconshock-invoice-40px.png differ
diff --git a/Site5/Master-v5.master b/Site5/Master-v5.master
index 4cd22e12..1f12967b 100644
--- a/Site5/Master-v5.master
+++ b/Site5/Master-v5.master
@@ -165,7 +165,7 @@
-
+
diff --git a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx
new file mode 100644
index 00000000..79123e35
--- /dev/null
+++ b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx
@@ -0,0 +1,151 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="CreateInboundInvoice.aspx.cs" Inherits="Swarmops.Frontend.Pages.v5.Financial.CreateInboundInvoice" %>
+<%@ Register src="~/Controls/v5/Base/FileUpload.ascx" tagname="FileUpload" tagprefix="Swarmops5" %>
+<%@ Register TagPrefix="Swarmops5" TagName="ExternalScripts" Src="~/Controls/v5/UI/ExternalScripts.ascx" %>
+<%@ Register TagPrefix="Swarmops5" TagName="ComboBudgets" Src="~/Controls/v5/Financial/ComboBudgets.ascx" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+