From fae3fee14fbf11cabf5c569dfa302c04b1d1d934 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 11 May 2021 00:01:26 +0000 Subject: [PATCH] --- server/AyaNova/biz/FormFieldReference.cs | 3 +-- server/AyaNova/models/WorkOrderItemLabor.cs | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index 5fb7007f..8fabd505 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -936,8 +936,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "WorkOrderItemLaborManualDiscountPct", FieldKey = "WorkOrderItemLaborManualDiscountPct", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "WorkOrderItemLaborBasePrice", FieldKey = "WorkOrderItemLaborBasePrice", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "WorkOrderItemLaborPrice", FieldKey = "WorkOrderItemLaborPrice", TKeySection = "WorkOrderItemLabors" }); - l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStartDate", FieldKey = "WorkOrderItemLaborServiceStartDate", TKeySection = "WorkOrderItemLabors" }); - + /* diff --git a/server/AyaNova/models/WorkOrderItemLabor.cs b/server/AyaNova/models/WorkOrderItemLabor.cs index 323d37eb..3f6eaff5 100644 --- a/server/AyaNova/models/WorkOrderItemLabor.cs +++ b/server/AyaNova/models/WorkOrderItemLabor.cs @@ -13,14 +13,20 @@ namespace AyaNova.Models public uint Concurrency { get; set; } public long? UserId { get; set; } + [NotMapped] + public string UserViz { get; set; } public DateTime? ServiceStartDate { get; set; } public DateTime? ServiceStopDate { get; set; } public long? ServiceRateId { get; set; } + [NotMapped] + public string ServiceRateViz { get; set; } public string ServiceDetails { get; set; } public decimal ServiceRateQuantity { get; set; } public decimal NoChargeQuantity { get; set; } public long? ServiceBankId { get; set; } public long? TaxCodeSaleId { get; set; } + [NotMapped] + public string TaxCodeSaleViz { get; set; } public decimal BasePrice { get; set; }//Rate price per unit at time of entry public decimal Price { get; set; }//contract adjusted price or a copy of BasePrice if no contract public decimal ManualDiscountPct { get; set; }// (V7 "Discount") ad-hoc / % off of the contractprice (which is always set regardless if contract or not) entered manually