diff --git a/Site/Pages/v5/Financial/Json-ListInvoicesInbound.aspx.cs b/Site/Pages/v5/Financial/Json-ListInvoicesInbound.aspx.cs
index b8f576ff..863eff75 100644
--- a/Site/Pages/v5/Financial/Json-ListInvoicesInbound.aspx.cs
+++ b/Site/Pages/v5/Financial/Json-ListInvoicesInbound.aspx.cs
@@ -36,10 +36,12 @@ public partial class Pages_v5_Finance_Json_ListInvoicesInbound : DataV5Base
StringBuilder result = new StringBuilder (16384);
string hasDoxString =
- "
";
+ "
";
result.Append ("{\"rows\":[");
+ DateTime dueDateFormatBreakDate = DateTime.Today.AddDays(-240);
+
foreach (InboundInvoice invoice in _invoices)
{
result.Append("{");
@@ -54,11 +56,13 @@ public partial class Pages_v5_Finance_Json_ListInvoicesInbound : DataV5Base
//"
" +
"\"",
"#" + invoice.Identity.ToString("N0"),
- JsonSanitize(invoice.DueDate.ToString("MMM-dd")),
+
+ JsonSanitize(invoice.DueDate.ToString(invoice.DueDate < dueDateFormatBreakDate ? "YYYY-MMM" : "MMM-dd")),
JsonSanitize(invoice.Supplier),
JsonSanitize(invoice.Budget.Name),
JsonSanitize((invoice.AmountCents/100.0).ToString("N2")),
- GetProgressTicks(invoice));
+ GetProgressTicks(invoice),
+ invoice.Identity); // Item #6 is only present in hasDoxString above
result.Append("},");
}
diff --git a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx
index f3709669..818737e6 100644
--- a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx
+++ b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx
@@ -184,11 +184,11 @@
|
- |
- |
+ |
+ |
|
|
- |
+ |
|
|
diff --git a/Site/Site.csproj b/Site/Site.csproj
index a80add98..282b9631 100644
--- a/Site/Site.csproj
+++ b/Site/Site.csproj
@@ -874,6 +874,9 @@
+
+
+