server/AyaNova/models/WorkOrderItemPart.cs

@@ -18,13 +18,30 @@ namespace AyaNova.Models
         [Required]
         public long PartWarehouseId { get; set; }
         [Required]
-        public decimal Quantity { get; set; }
-        public decimal Cost { get; set; }//cost at time of entry from part table
-        public decimal BasePrice { get; set; }//part retail price at time of entry (V7 "Price")
-        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
+        public decimal Quantity { get; set; }        
         public long? TaxPartSaleId { get; set; }
 
+        //PRICE FIELDS
+        [Required]
+        public decimal Cost { get; set; }
+        [Required]
+        public decimal ListPrice { get; set; }
+        [Required]
+        public decimal Price { get; set; }
+        [Required]
+        public string TaxName { get; set; }
+        [Required]
+        public decimal TaxAPct { get; set; }
+        [Required]
+        public decimal TaxBPct { get; set; }
+        [Required]
+        public bool TaxOnTax { get; set; }
+        [NotMapped]
+        public decimal TaxAViz { get; set; }
+        [NotMapped]
+        public decimal TaxBViz { get; set; }
+        [NotMapped]
+        public decimal LineTotalViz { get; set; }
 
         //UTILITY FIELDS
         [NotMapped]

server/AyaNova/models/WorkOrderItemTravel.cs

@@ -10,7 +10,7 @@ namespace AyaNova.Models
     {
         public long Id { get; set; }
         public uint Concurrency { get; set; }
-       
+
         public long? UserId { get; set; }
         public DateTime? TravelStartDate { get; set; }
         public DateTime? TravelStopDate { get; set; }
@@ -21,9 +21,34 @@ namespace AyaNova.Models
         public long? ServiceBankId { get; set; }
         public long? TaxCodeSaleId { get; set; }
         public decimal Distance { 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
+
+        // 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
+
+        //PRICE FIELDS
+        [Required]
+        public decimal Cost { get; set; }
+        [Required]
+        public decimal ListPrice { get; set; }
+        [Required]
+        public decimal Price { get; set; }
+        [Required]
+        public string TaxName { get; set; }
+        [Required]
+        public decimal TaxAPct { get; set; }
+        [Required]
+        public decimal TaxBPct { get; set; }
+        [Required]
+        public bool TaxOnTax { get; set; }
+        [NotMapped]
+        public decimal TaxAViz { get; set; }
+        [NotMapped]
+        public decimal TaxBViz { get; set; }
+        [NotMapped]
+        public decimal LineTotalViz { get; set; }
+
+
 
         //UTILITY FIELDS
         [NotMapped]
@@ -36,7 +61,7 @@ namespace AyaNova.Models
         public WorkOrderItem WorkOrderItem { get; set; }
 
         [NotMapped, JsonIgnore]
-        public AyaType AyaType { get => AyaType.WorkOrderItemTravel; }       
+        public AyaType AyaType { get => AyaType.WorkOrderItemTravel; }
 
     }//eoc
 }//eons