From 858f030708fe622932d87555ea5b6b2e63f5a674 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 21 May 2021 14:17:31 +0000 Subject: [PATCH] --- server/AyaNova/biz/FormFieldReference.cs | 44 ++++++++++----------- server/AyaNova/biz/WorkOrderBiz.cs | 2 +- server/AyaNova/models/WorkOrderItemLabor.cs | 2 +- server/AyaNova/resource/de.json | 3 +- server/AyaNova/resource/en.json | 3 +- server/AyaNova/resource/es.json | 3 +- server/AyaNova/resource/fr.json | 3 +- 7 files changed, 32 insertions(+), 28 deletions(-) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index beb6b34a..b03d3655 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -947,34 +947,34 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "Price", FieldKey = "LaborPrice", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "PriceOverride", FieldKey = "LaborPriceOverride", TKeySection = "WorkOrderItemLabors" }); - // l.Add(new FormField { TKey = "TaxCodeTaxA", FieldKey = "LaborTaxAPct", TKeySection = "WorkOrderItemLabors" }); - // l.Add(new FormField { TKey = "TaxCodeTaxB", FieldKey = "LaborTaxBPct", TKeySection = "WorkOrderItemLabors" }); - // l.Add(new FormField { TKey = "TaxCodeTaxOnTax", FieldKey = "LaborTaxOnTax", TKeySection = "WorkOrderItemLabors" }); + l.Add(new FormField { TKey = "UnitOfMeasure", FieldKey = "LaborUnitOfMeasureViz", TKeySection = "WorkOrderItemLabors" }); + l.Add(new FormField { TKey = "NetPrice", FieldKey = "LaborNetViz", TKeySection = "WorkOrderItemLabors" }); + l.Add(new FormField { TKey = "TaxAAmt", FieldKey = "LaborTaxAViz", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "TaxBAmt", FieldKey = "LaborTaxBViz", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "LineTotal", FieldKey = "LaborLineTotalViz", TKeySection = "WorkOrderItemLabors" }); -/* + /* - + 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 CostViz { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered - [NotMapped] - public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered - [NotMapped] - + 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 + + 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 CostViz { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered + [NotMapped] + public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered + [NotMapped] + + 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 -*/ + */ diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index c9686549..b6a61aa5 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -2028,7 +2028,7 @@ namespace AyaNova.Biz { o.CostViz = Rate.Cost; o.ListPriceViz = Rate.Charge; - o.ChargeUnitViz = Rate.Unit; + o.UnitOfMeasureViz = Rate.Unit; o.PriceViz = Rate.Charge;//default price used if not manual or contract override } diff --git a/server/AyaNova/models/WorkOrderItemLabor.cs b/server/AyaNova/models/WorkOrderItemLabor.cs index 218f3073..76ee1c55 100644 --- a/server/AyaNova/models/WorkOrderItemLabor.cs +++ b/server/AyaNova/models/WorkOrderItemLabor.cs @@ -37,7 +37,7 @@ namespace AyaNova.Models [NotMapped] public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered [NotMapped] - public string ChargeUnitViz { get; set; }//"each", "hour" etc + public string UnitOfMeasureViz { 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] diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index f66dd021..80d541db 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2222,5 +2222,6 @@ "WorkOrderItemPriorityColor": "Farbe", "SaveRecordToProceed":"Dieser Datensatz muss gespeichert werden, um fortzufahren", "GlobalWorkOrderCompleteByAge":"Standardalter für die Fertigstellung des Arbeitsauftrags", - "PriceOverride":"Preisüberschreibung" + "PriceOverride":"Preisüberschreibung", + "NetPrice":"Nettopreis" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index bf82a859..883b7e93 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -2227,5 +2227,6 @@ "TaxAAmt": "Tax A amount", "TaxBAmt": "Tax B amount", "GlobalWorkOrderCompleteByAge":"Default work order completion age", - "PriceOverride":"Price override" + "PriceOverride":"Price override", + "NetPrice":"Net price" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index ecfce773..9c03013a 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2222,5 +2222,6 @@ "WorkOrderItemPriorityColor": "Color", "SaveRecordToProceed":"Este registro debe guardarse para continuar", "GlobalWorkOrderCompleteByAge":"Âge d'achèvement des bons de travail par défaut", - "PriceOverride":"Anulación de precio" + "PriceOverride":"Anulación de precio", + "NetPrice":"Precio neto" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 74ddb532..f9d2edc4 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2222,5 +2222,6 @@ "WorkOrderItemPriorityColor": "Couleur", "SaveRecordToProceed":"Enregistrer pour continuer", "GlobalWorkOrderCompleteByAge":"Âge d'achèvement des bons de travail par défaut", - "PriceOverride":"Remplacement de prix" + "PriceOverride":"Remplacement de prix", + "NetPrice":"Prix net" } \ No newline at end of file