From 5d3ad4111ff6982b4ab97abfe46ff934ebc1c6f6 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 16 Feb 2021 22:04:39 +0000 Subject: [PATCH] --- server/AyaNova/biz/FormFieldReference.cs | 17 +++++++++++++++-- server/AyaNova/biz/PurchaseOrderBiz.cs | 11 +++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index d9665db0..b5def13d 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -606,13 +606,26 @@ namespace AyaNova.Biz #region PurchaseOrder { List l = new List(); - l.Add(new FormField { TKey = "Name", FieldKey = "Name", Hideable = false }); + l.Add(new FormField { TKey = "Serial", FieldKey = "Serial", Hideable = false }); l.Add(new FormField { TKey = "PurchaseOrderNotes", FieldKey = "Notes" }); - l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false }); l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" }); l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" }); + l.Add(new FormField { TKey = "PurchaseOrderVendorMemo", FieldKey = "VendorMemo" }); + l.Add(new FormField { TKey = "PurchaseOrderDropShipToCustomerID", FieldKey = "DropShipToCustomerId" }); + l.Add(new FormField { TKey = "PurchaseOrderReferenceNumber", FieldKey = "ReferenceNumber" }); + l.Add(new FormField { TKey = "Vendor", FieldKey = "VendorId" }); + l.Add(new FormField { TKey = "PurchaseOrderOrderedDate", FieldKey = "OrderedDate" }); + l.Add(new FormField { TKey = "PurchaseOrderExpectedReceiveDate", FieldKey = "ExpectedReceiveDate" }); + l.Add(new FormField { TKey = "PurchaseOrderStatus", FieldKey = "PurchaseOrderStatus" }); + l.Add(new FormField { TKey = "Project", FieldKey = "ProjectId" }); + l.Add(new FormField { TKey = "PurchaseOrderReceiptText1", FieldKey = "Text1" }); + l.Add(new FormField { TKey = "PurchaseOrderReceiptText2", FieldKey = "Text2" }); + //todo: may need more here for the receiving form and grid + //as they will be hideable + + l.Add(new FormField { TKey = "PurchaseOrderCustom1", FieldKey = "PurchaseOrderCustom1", IsCustomField = true }); l.Add(new FormField { TKey = "PurchaseOrderCustom2", FieldKey = "PurchaseOrderCustom2", IsCustomField = true }); l.Add(new FormField { TKey = "PurchaseOrderCustom3", FieldKey = "PurchaseOrderCustom3", IsCustomField = true }); diff --git a/server/AyaNova/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs index 13991899..ef680fc9 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -81,10 +81,16 @@ namespace AyaNova.Biz } PurchaseOrder newObject = new PurchaseOrder(); CopyObject.Copy(dbObject, newObject, "Wiki,Serial"); + foreach(var item in newObject.Items){ + item.QuantityReceived=0; + item.ReceivedCost=0; + item.ReceivedDate=null; + item.PurchaseOrderId=0; + } newObject.Id = 0; newObject.Concurrency = 0; await ct.PurchaseOrder.AddAsync(newObject); - await ct.SaveChangesAsync(); + await ct.SaveChangesAsync(); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, BizType, AyaEvent.Created), ct); await SearchIndexAsync(newObject, true); await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, newObject.Tags, null); @@ -260,7 +266,8 @@ namespace AyaNova.Biz private async Task ValidateCanDeleteAsync(PurchaseOrder inObj) { - //only if none received right? Or do we allow it and just reverse the whole shebang? + //We allow delete even if received, will reverse automatically all inventory and affected objects + //not sure if there is anything here to check await Task.CompletedTask; }