From ed164796c721ec1b66c41c9e14f7cad0a29dc395 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 1 Mar 2021 21:07:59 +0000 Subject: [PATCH] --- server/AyaNova/biz/PurchaseOrderBiz.cs | 18 +++++++++--------- server/AyaNova/models/PurchaseOrderItem.cs | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/server/AyaNova/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs index d7973962..0f34e9ee 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -151,20 +151,20 @@ namespace AyaNova.Biz { - item.DisplayPartNumber = await ct.Part.AsNoTracking().Where(x => x.Id == item.PartId).Select(x => x.PartNumber).SingleAsync(); - item.DisplayWarehouse = await ct.PartWarehouse.AsNoTracking().Where(x => x.Id == item.PartWarehouseId).Select(x => x.Name).SingleAsync(); + item.PartViz = await ct.Part.AsNoTracking().Where(x => x.Id == item.PartId).Select(x => x.PartNumber).SingleAsync(); + item.WarehouseViz = await ct.PartWarehouse.AsNoTracking().Where(x => x.Id == item.PartWarehouseId).Select(x => x.Name).SingleAsync(); if (item.WorkorderItemPartRequestId != null) { po.HasPartRequest = true; - item.DisplayRequestWorkorder = "todo:woidfromleafnode";//MIGRATE_OUTSTANDING routine to get wo id from the woitempartrequestid + item.WorkorderItemPartRequestViz = "todo:woidfromleafnode";//MIGRATE_OUTSTANDING routine to get wo id from the woitempartrequestid if (item.PartRequestedById != null) - item.DisplayRequestUser = await ct.User.AsNoTracking().Where(x => x.Id == item.PartRequestedById).Select(x => x.Name).SingleAsync(); + item.PartRequestedByViz = await ct.User.AsNoTracking().Where(x => x.Id == item.PartRequestedById).Select(x => x.Name).SingleAsync(); } TaxCode tax = null; if (item.PurchaseTaxCodeId != null) { tax = await ct.TaxCode.AsNoTracking().Where(x => x.Id == item.PurchaseTaxCodeId).SingleAsync(); - item.DisplayTaxCode = tax.Name; + item.PurchaseTaxCodeViz = tax.Name; po.HasTaxes = true; } @@ -195,10 +195,10 @@ namespace AyaNova.Biz dTaxB = (dNet + dTaxA) * tax.TaxB;//tax on tax } //set line total and taxes display values - item.DisplayTaxA = dTaxA; - item.DisplayTaxB = dTaxB; - item.DisplayNetTotal = dNet; - item.DisplayLineTotal = dNet + dTaxA + dTaxB; + item.TaxAViz = dTaxA; + item.TaxBViz = dTaxB; + item.NetTotalViz = dNet; + item.LineTotalViz = dNet + dTaxA + dTaxB; } } } diff --git a/server/AyaNova/models/PurchaseOrderItem.cs b/server/AyaNova/models/PurchaseOrderItem.cs index fcb2c956..529bfef8 100644 --- a/server/AyaNova/models/PurchaseOrderItem.cs +++ b/server/AyaNova/models/PurchaseOrderItem.cs @@ -37,24 +37,24 @@ namespace AyaNova.Models //server populated fields not db fields [NotMapped] - public string DisplayPartNumber { get; set; } + public string PartViz { get; set; } [NotMapped] - public string DisplayWarehouse { get; set; } + public string WarehouseViz { get; set; } [NotMapped] - public string DisplayRequestUser { get; set; } + public string PartRequestedByViz { get; set; }//DisplayRequestUser [NotMapped] - public string DisplayRequestWorkorder { get; set; } + public string WorkorderItemPartRequestViz { get; set; }//DisplayRequestWorkorder [NotMapped] - public string DisplayTaxCode { get; set; } + public string PurchaseTaxCodeViz { get; set; }//DisplayTaxCode [NotMapped] - public decimal DisplayNetTotal { get; set; } + public decimal NetTotalViz { get; set; }//DisplayNetTotal [NotMapped] - public decimal DisplayTaxA { get; set; } + public decimal TaxAViz { get; set; }//DisplayTaxA [NotMapped] - public decimal DisplayTaxB { get; set; } + public decimal TaxBViz { get; set; }//DisplayTaxB [NotMapped] - public decimal DisplayLineTotal { get; set; } + public decimal LineTotalViz { get; set; }//DisplayLineTotal