admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-05-21 14:17:31 +00:00
parent f24ec9b9bc
commit 858f030708
7 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
server/AyaNova/biz/FormFieldReference.cs
View File

@@ -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
*/
*/

2
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -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
}

2
server/AyaNova/models/WorkOrderItemLabor.cs
View File

@@ -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]

3
server/AyaNova/resource/de.json
View File

@@ -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"
}

3
server/AyaNova/resource/en.json
View File

@@ -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"
}

3
server/AyaNova/resource/es.json
View File

@@ -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"
}

3
server/AyaNova/resource/fr.json
View File

@@ -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"
}