From c51cbe763fcf9a67eb8cf1b5009987496314d64e Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 17 Jun 2021 19:20:04 +0000 Subject: [PATCH] --- server/AyaNova/biz/WorkOrderBiz.cs | 4 ++-- server/AyaNova/models/WorkOrderItemExpense.cs | 2 +- server/AyaNova/models/WorkOrderItemPart.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index b82c330d..24c7de88 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -2224,7 +2224,7 @@ namespace AyaNova.Biz if (o.ChargeTaxCodeId != null) Tax = await ct.TaxCode.AsNoTracking().FirstOrDefaultAsync(z => z.Id == o.ChargeTaxCodeId); if (Tax != null) - o.ChargeTaxCodeViz = Tax.Name; + o.TaxCodeViz = Tax.Name; //Calculate totals and taxes o.TaxAViz = 0; @@ -3934,7 +3934,7 @@ namespace AyaNova.Biz if (o.TaxPartSaleId != null) Tax = await ct.TaxCode.AsNoTracking().FirstOrDefaultAsync(z => z.Id == o.TaxPartSaleId); if (Tax != null) - o.TaxPartSaleViz = Tax.Name; + o.TaxCodeViz = Tax.Name; o.PriceViz = 0; if (part != null) diff --git a/server/AyaNova/models/WorkOrderItemExpense.cs b/server/AyaNova/models/WorkOrderItemExpense.cs index 2af2d801..8483e7ed 100644 --- a/server/AyaNova/models/WorkOrderItemExpense.cs +++ b/server/AyaNova/models/WorkOrderItemExpense.cs @@ -22,7 +22,7 @@ namespace AyaNova.Models public decimal TaxPaid { get; set; } public long? ChargeTaxCodeId { get; set; } [NotMapped] - public string ChargeTaxCodeViz { get; set; } + public string TaxCodeViz { get; set; } public bool ReimburseUser { get; set; } = false; public long? UserId { get; set; } diff --git a/server/AyaNova/models/WorkOrderItemPart.cs b/server/AyaNova/models/WorkOrderItemPart.cs index 8b829897..8fdd7a7d 100644 --- a/server/AyaNova/models/WorkOrderItemPart.cs +++ b/server/AyaNova/models/WorkOrderItemPart.cs @@ -27,7 +27,7 @@ namespace AyaNova.Models public decimal Quantity { get; set; } public long? TaxPartSaleId { get; set; } [NotMapped] - public string TaxPartSaleViz { get; set; } + public string TaxCodeViz { get; set; } //NOTE: part prices are volatile and expected to be frequently edited so snapshotted when newly added unlike other things like rates etc that are protected from change public decimal Cost { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered