server/AyaNova/models/WorkOrderItemLabor.cs

@@ -25,43 +25,29 @@ namespace AyaNova.Models
         public decimal NoChargeQuantity { get; set; }
         public long? ServiceBankId { get; set; }
         public long? TaxCodeSaleId { get; set; }
-      
+        [NotMapped]
+        public string TaxCodeSaleViz { get; set; }
 
 
-        /*
-        //from case 3748 
-        - Cost,  this is the entered Cost for the item at time of selection
-        - ListPrice,  [REQUIRED] this is the un-discounted per unit price of the item be it labor, parts, loaner, travel etc.  What is normally charged at that moment in time for this item if it wasn't discounted.
-        - Price, [NULLABLE] this is the EFFECTIVE PER UNIT PRICE either contract determined price calculated from ListPrice, otherwise it's a copy of the list price.  User with sufficient rights can can override it to enter a different amount which effectively supports manual discount feature in v7 which was by %.  This is the *actual* price used in calculations.
-        - TaxName copied from selected tax code, not directly editable
-        - TaxAPct copied from selected tax code, not directly editable
-        - TaxBPct copied from selected tax code, not directly editable
-        - TaxOnTax copied from selected tax code not directly editable
-        - TaxAViz, [calculated NOT persisted] (Price*Quantity)+TaxAPct
-        - TaxBViz, [calculated NOT persisted] (Price*Quantity)+TaxBPct OR if TaxOnTax = TaxAViz+TaxBPct
-        - LineTotalViz, [calculated NOT persisted] this is effectively Price * quantity + Taxes, handy for reports and viewing not editable as it's not stored
-        */
-
-        //PRICE FIELDS
-        [Required]
-        public decimal Cost { get; set; }
-        [Required]
-        public decimal ListPrice { get; set; }
-        [Required]
-        public decimal Price { get; set; }        
-        public string TaxName { get; set; }
-        [Required]
-        public decimal TaxAPct { get; set; }
-        [Required]
-        public decimal TaxBPct { get; set; }
-        [Required]
-        public bool TaxOnTax { get; set; }
+        //Standard pricing fields (mostly to support printed reports though some show in UI)
+        //some not to be sent with record depending on role (i.e. cost and charge in some cases)
+        public decimal? ManualPrice { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero
         [NotMapped]
-        public decimal TaxAViz { get; set; }
+        public decimal CostViz { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered
         [NotMapped]
-        public decimal TaxBViz { get; set; }
+        public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered
         [NotMapped]
-        public decimal LineTotalViz { get; set; }
+        public string ChargeUnitViz { get; set; }//"each", "hour" etc
+        [NotMapped]
+        public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override
+        [NotMapped]
+        public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially)
+        [NotMapped]
+        public decimal TaxAViz { get; set; }//total amount of taxA
+        [NotMapped]
+        public decimal TaxBViz { get; set; }//total amount of taxB
+        [NotMapped]
+        public decimal LineTotalViz { get; set; }//line total netViz + taxes