From 9644fcb5a93be7dc3b7bb63812d2970ea01b320b Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 30 Nov 2017 21:02:00 +0100 Subject: [PATCH] Some tests for Outbound Invoices --- Logic/Support/Document.cs | 2 +- Site/Pages/v5/Financial/Json-ListInvoicesOutbound.aspx.cs | 2 +- Site/Pages/v5/Financial/ListInvoicesInbound.aspx.cs | 2 +- Site/Pages/v5/Financial/ListInvoicesOutbound.aspx | 2 ++ Site/Pages/v5/Financial/ListInvoicesOutbound.aspx.cs | 5 ++++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Logic/Support/Document.cs b/Logic/Support/Document.cs index e9a553ce..7b4d8568 100644 --- a/Logic/Support/Document.cs +++ b/Logic/Support/Document.cs @@ -130,7 +130,7 @@ namespace Swarmops.Logic.Support } else if (foreignObject is OutboundInvoice) { - return Common.Enums.DocumentType.OutboundInvoice; + return DocumentType.OutboundInvoice; } else if (foreignObject is VatReport) { diff --git a/Site/Pages/v5/Financial/Json-ListInvoicesOutbound.aspx.cs b/Site/Pages/v5/Financial/Json-ListInvoicesOutbound.aspx.cs index 17bc24a1..826963b8 100644 --- a/Site/Pages/v5/Financial/Json-ListInvoicesOutbound.aspx.cs +++ b/Site/Pages/v5/Financial/Json-ListInvoicesOutbound.aspx.cs @@ -61,7 +61,7 @@ public partial class Pages_v5_Finance_Json_ListInvoicesOutbound : DataV5Base //"" + //"" + "\"", - "#" + invoice.Identity.ToString("N0"), + "#" + invoice.OrganizationSequenceId.ToString("N0"), JsonSanitize(invoice.DueDate.ToString(invoice.DueDate < dueDateFormatBreakDate ? "yyyy-MMM" : "MMM-dd")), "Supplier", diff --git a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx.cs b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx.cs index 9684310e..94b3a658 100644 --- a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx.cs +++ b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx.cs @@ -47,7 +47,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial CurrentAuthority.HasAccess (new Access (CurrentOrganization, AccessAspect.Administration)).ToString(CultureInfo.InvariantCulture).ToLowerInvariant(); PopulateInboundInvoices(); - PopulateExpenses(); + // PopulateExpenses(); // PopulateSalaries(); RegisterControl(EasyUIControl.DataGrid); diff --git a/Site/Pages/v5/Financial/ListInvoicesOutbound.aspx b/Site/Pages/v5/Financial/ListInvoicesOutbound.aspx index 8c2c4d96..f588331f 100644 --- a/Site/Pages/v5/Financial/ListInvoicesOutbound.aspx +++ b/Site/Pages/v5/Financial/ListInvoicesOutbound.aspx @@ -65,6 +65,8 @@ onLoadSuccess: function () { $(".LocalViewDox").click(function () { + alertify.log($(this).attr("baseid")); + $("a.FancyBox_Gallery[rel='" + $(this).attr("baseid") + "']").first().click(); }); diff --git a/Site/Pages/v5/Financial/ListInvoicesOutbound.aspx.cs b/Site/Pages/v5/Financial/ListInvoicesOutbound.aspx.cs index ebc4c739..61a9d9ea 100644 --- a/Site/Pages/v5/Financial/ListInvoicesOutbound.aspx.cs +++ b/Site/Pages/v5/Financial/ListInvoicesOutbound.aspx.cs @@ -189,9 +189,12 @@ namespace Swarmops.Frontend.Pages.v5.Financial Documents dox = invoice.Documents; bool hasDox = (dox.Count > 0 ? true : false); - AddDocuments(invoice.Documents, "O" + invoice.Identity.ToString(CultureInfo.InvariantCulture), + if (hasDox) + { + AddDocuments(invoice.Documents, "O" + invoice.Identity.ToString(CultureInfo.InvariantCulture), String.Format(Global.Financial_OutboundInvoiceSpecificationWithCustomer + " - ", invoice.OrganizationSequenceId, invoice.CustomerName) + Global.Global_ImageSpecification); + } } }