From e6b567edde7c2ea2be18f4d73a332b414bc16104 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Wed, 7 Jul 2021 13:29:59 +0200 Subject: [PATCH] Enabled date to propagate for new invoices --- Logic/Financial/InboundInvoice.cs | 4 ++-- Site/Controls/v5/Base/DateTextBox.ascx.cs | 2 +- .../v5/Financial/CreateInboundInvoice.aspx | 5 ++--- .../v5/Financial/CreateInboundInvoice.aspx.cs | 8 ++++---- .../CreateInboundInvoice.aspx.designer.cs | 17 ++++------------- 5 files changed, 13 insertions(+), 23 deletions(-) diff --git a/Logic/Financial/InboundInvoice.cs b/Logic/Financial/InboundInvoice.cs index dc17f4f4..1c1ac679 100644 --- a/Logic/Financial/InboundInvoice.cs +++ b/Logic/Financial/InboundInvoice.cs @@ -191,7 +191,7 @@ namespace Swarmops.Logic.Financial } } - public static InboundInvoice Create (Organization organization, DateTime dueDate, Int64 amountCents, + public static InboundInvoice Create (Organization organization, DateTime issuedDate, DateTime dueDate, Int64 amountCents, Int64 vatCents, FinancialAccount budget, string supplier, string description, string payToAccount, string ocr, string invoiceReference, Person creatingPerson) { @@ -210,7 +210,7 @@ namespace Swarmops.Logic.Financial // Create a corresponding financial transaction with rows FinancialTransaction transaction = - FinancialTransaction.Create (organization.Identity, DateTime.UtcNow, + FinancialTransaction.Create (organization.Identity, issuedDate == DateTime.Today? DateTime.UtcNow: issuedDate.AddHours(12), "Invoice #" + newInvoice.OrganizationSequenceId + " from " + supplier); transaction.AddRow (organization.FinancialAccounts.DebtsInboundInvoices, -amountCents, creatingPerson); diff --git a/Site/Controls/v5/Base/DateTextBox.ascx.cs b/Site/Controls/v5/Base/DateTextBox.ascx.cs index 9325216b..940fd0dd 100644 --- a/Site/Controls/v5/Base/DateTextBox.ascx.cs +++ b/Site/Controls/v5/Base/DateTextBox.ascx.cs @@ -42,7 +42,7 @@ namespace Swarmops.Frontend.Controls.Base set { this.InterpretedDate.Value = value.ToString(CultureInfo.InvariantCulture); - this.TextInput.Text = value.ToString("YYYY MMM dd"); + this.TextInput.Text = value.ToString("yyyy MMM dd"); } } diff --git a/Site/Pages/v5/Financial/CreateInboundInvoice.aspx b/Site/Pages/v5/Financial/CreateInboundInvoice.aspx index 84b806d0..f2fccbbd 100644 --- a/Site/Pages/v5/Financial/CreateInboundInvoice.aspx +++ b/Site/Pages/v5/Financial/CreateInboundInvoice.aspx @@ -147,7 +147,6 @@
-
@@ -170,11 +169,11 @@