server/AyaNova/biz/FormFieldReference.cs

@@ -924,50 +924,61 @@ namespace AyaNova.Biz
 
 
 
+     //WORKORDER ITEM LABOR
+      l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStartDate", FieldKey = "WorkOrderItemLaborServiceStartDate", TKeySection = "WorkOrderItemLabors" });
+      l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStopDate", FieldKey = "WorkOrderItemLaborServiceStopDate", TKeySection = "WorkOrderItemLabors" });
+      l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateQuantity", FieldKey = "WorkOrderItemLaborServiceRateQuantity", TKeySection = "WorkOrderItemLabors" });
+      l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateID", FieldKey = "WorkOrderItemLaborServiceRateID", TKeySection = "WorkOrderItemLabors" });
+      l.Add(new FormField { TKey = "WorkOrderItemLaborServiceDetails", FieldKey = "WorkOrderItemLaborServiceDetails", TKeySection = "WorkOrderItemLabors" });
+      l.Add(new FormField { TKey = "WorkOrderItemLaborUserID", FieldKey = "WorkOrderItemLaborUserID", TKeySection = "WorkOrderItemLabors" });
+      l.Add(new FormField { TKey = "WorkOrderItemLaborNoChargeQuantity", FieldKey = "WorkOrderItemLaborNoChargeQuantity", TKeySection = "WorkOrderItemLabors" });
+      l.Add(new FormField { TKey = "WorkOrderItemLaborTaxRateSaleID", FieldKey = "WorkOrderItemLaborTaxRateSaleID", TKeySection = "WorkOrderItemLabors" });
+      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" });
+
                     /*
                      
-  l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeAmount", FieldKey = "WorkOrderItemExpenseChargeAmount", TKeySection = "WorkOrderItemExpense" });
+    public long? UserId { get; set; }
-                    l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeTaxCodeID", FieldKey = "WorkOrderItemExpenseChargeTaxCodeID", TKeySection = "WorkOrderItemExpense" });
+        public DateTime? ServiceStartDate { get; set; }
-                    l.Add(new FormField { TKey = "WorkOrderItemExpenseTaxPaid", FieldKey = "WorkOrderItemExpenseTaxPaid", TKeySection = "WorkOrderItemExpense" });
+        public DateTime? ServiceStopDate { get; set; }
-                    l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeToCustomer", FieldKey = "WorkOrderItemExpenseChargeToCustomer", TKeySection = "WorkOrderItemExpense" });
+        public long? ServiceRateId { get; set; }
-                    l.Add(new FormField { TKey = "WorkOrderItemExpenseDescription", FieldKey = "WorkOrderItemExpenseDescription", TKeySection = "WorkOrderItemExpense" });
+        public string ServiceDetails { get; set; }
-                    l.Add(new FormField { TKey = "WorkOrderItemExpenseName", FieldKey = "WorkOrderItemExpenseName", TKeySection = "WorkOrderItemExpense" });
+        public decimal ServiceRateQuantity { get; set; }
-                    l.Add(new FormField { TKey = "WorkOrderItemExpenseReimburseUser", FieldKey = "WorkOrderItemExpenseReimburseUser", TKeySection = "WorkOrderItemExpense" });
+        public decimal NoChargeQuantity { get; set; }
-                    l.Add(new FormField { TKey = "WorkOrderItemExpenseTotalCost", FieldKey = "WorkOrderItemExpenseTotalCost", TKeySection = "WorkOrderItemExpense" });
+        public long? ServiceBankId { get; set; }
-                    l.Add(new FormField { TKey = "WorkOrderItemExpenseUserID", FieldKey = "WorkOrderItemExpenseUserID", TKeySection = "WorkOrderItemExpense" });
+        public long? TaxCodeSaleId { 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
 
-
+"WorkOrderItemLaborBanked": "Banked",
-                        public string Description { get; set; }
+  "WorkOrderItemLaborRateCharge": "Rate Charge",
-                            public string Name { get; set; }
+  "WorkOrderItemLaborList": "Labors",
-                            [Required]
+  "WorkOrderItemLaborNoChargeQuantity": "No Charge Quantity",
-                            public decimal TotalCost { get; set; }
+  "WorkOrderItemLaborServiceDetails": "Service Details",
-                            [Required]
+  "WorkOrderItemLaborServiceRateID": "Service Rate",
-                            public decimal ChargeAmount { get; set; }
+  "WorkOrderItemLaborServiceRateQuantity": "Service Rate Quantity",
-                            [Required]
+  "WorkOrderItemLaborServiceStartDate": "Service Start Date Time",
-                            public decimal TaxPaid { get; set; }
+  "WorkOrderItemLaborServiceStopDate": "Service Stop Date Time",
-                            public long? ChargeTaxCodeId { get; set; }
+  "WorkOrderItemLaborTaxCodeID": "Tax Code",
-                            [NotMapped]
+  "WorkOrderItemLaborTaxRateSaleID": "Sales tax",
-                            public string ChargeTaxCodeViz { get; set; }
+  "WorkOrderItemLaborUIBankWarning": "Are you sure you want to Bank this record?\r\n(Once this record is banked it will be locked and can no longer be edited)",
-                            public bool ReimburseUser { get; set; } = false;
+  "WorkOrderItemLaborUIReBankWarning": "This item is already banked",
-                            public long? UserId { get; set; }
+  "WorkOrderItemLaborUserID": "User",
-                            [NotMapped]
+WorkOrderItemLaborManualDiscountPct
-                            public string UserViz { get; set; }
+WorkOrderItemLaborBasePrice
-                            public bool ChargeToCustomer { get; set; } = false;
+WorkOrderItemLaborPrice
 
 
 
 
-"WorkOrderItemExpenseChargeAmount": "Charge Amount",
+"CREATE TABLE aworkorderitemlabor (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderitemid BIGINT NOT NULL REFERENCES aworkorderitem (id), "
-                      "WorkOrderItemExpenseChargeTaxCodeID": "Charge Tax Code",
+                    + "userid BIGINT REFERENCES auser, servicestartdate TIMESTAMP, servicestopdate TIMESTAMP, servicerateid BIGINT REFERENCES aservicerate, servicedetails text,  "
-                      "WorkOrderItemExpenseChargeToCustomer": "Charge to customer",
+                    + "serviceratequantity DECIMAL(19,5) NOT NULL default 0, nochargequantity DECIMAL(19,5) NOT NULL default 0, servicebankid BIGINT REFERENCES aservicebank, "
-                      "WorkOrderItemExpenseDescription": "Description", 
+                    + "taxcodesaleid BIGINT REFERENCES ataxcode, baseprice DECIMAL(38,18) NOT NULL default 0, price DECIMAL(38,18) NOT NULL default 0, "
-                      "WorkOrderItemExpenseList": "Expenses",
+                    + "manualdiscountpct DECIMAL(8,5) NOT NULL default 0 "
-                      "WorkOrderItemExpenseName": "Misc Exp Summary",
-                      "WorkOrderItemExpenseReimburseUser": "Reimburse User",
-                      "WorkOrderItemExpenseTaxPaid": "Tax Paid",
-                      "WorkOrderItemExpenseTotalCost": "Total Cost",
-                      "WorkOrderItemExpenseUser": "User",
-                      "WorkOrderItemExpenseUserID": "User",
                     */
 
 

server/AyaNova/resource/de.json

@@ -1466,6 +1466,9 @@
   "WorkOrderItemLaborServiceStopDate": "Service - Enddatum und -zeit",
   "WorkOrderItemLaborTaxCodeID": "Steuercode",
   "WorkOrderItemLaborTaxRateSaleID": "Umsatzsteuer",
+  "WorkOrderItemLaborManualDiscountPct": "Manueller Rabatt",
+  "WorkOrderItemLaborBasePrice": "Grundpreis",
+  "WorkOrderItemLaborPrice": "Nettopreis",
   "WorkOrderItemLaborUIBankWarning": "Sind Sie sicher, dass Sie diesen Datensatz gutschreiben möchten? (Sobald dieser Datensatz gutgeschrieben ist, wird er gesperrt und kann nicht mehr bearbeitet werden.",
   "WorkOrderItemLaborUIReBankWarning": "Dieser Posten ist bereits gutgeschrieben",
   "WorkOrderItemLaborUserID": "Benutzer",

server/AyaNova/resource/en.json

@@ -1466,6 +1466,9 @@
   "WorkOrderItemLaborServiceStopDate": "Service Stop Date Time",
   "WorkOrderItemLaborTaxCodeID": "Tax Code",
   "WorkOrderItemLaborTaxRateSaleID": "Sales tax",
+  "WorkOrderItemLaborManualDiscountPct": "Manual discount",
+  "WorkOrderItemLaborBasePrice": "Base price",
+  "WorkOrderItemLaborPrice": "Net price",
   "WorkOrderItemLaborUIBankWarning": "Are you sure you want to Bank this record?\r\n(Once this record is banked it will be locked and can no longer be edited)",
   "WorkOrderItemLaborUIReBankWarning": "This item is already banked",
   "WorkOrderItemLaborUserID": "User",
@@ -2217,5 +2220,4 @@
   "WorkOrderItemPriorityList": "Work order item priority list",
   "WorkOrderItemPriorityName": "Name",
   "WorkOrderItemPriorityColor": "Color"
-
 }

server/AyaNova/resource/es.json

@@ -1466,6 +1466,9 @@
   "WorkOrderItemLaborServiceStopDate": "Fecha y hora fin de servicio",
   "WorkOrderItemLaborTaxCodeID": "Código fiscal",
   "WorkOrderItemLaborTaxRateSaleID": "Impuesto sobre la venta",
+  "WorkOrderItemLaborManualDiscountPct": "Descuento manual",
+  "WorkOrderItemLaborBasePrice": "Precio base",
+  "WorkOrderItemLaborPrice": "Precio neto",
   "WorkOrderItemLaborUIBankWarning": "¿Seguro que desea restar este registro de los pagos por adelantado? (Una vez restado, quedará bloqueado y ya no podrá editarse)",
   "WorkOrderItemLaborUIReBankWarning": "Este elemento ya se ha restado de los pagos por adelantado",
   "WorkOrderItemLaborUserID": "Usuario",

server/AyaNova/resource/fr.json

@@ -1466,6 +1466,9 @@
   "WorkOrderItemLaborServiceStopDate": "Date et heure de fin de service",
   "WorkOrderItemLaborTaxCodeID": "Code de taxe",
   "WorkOrderItemLaborTaxRateSaleID": "Taxe sur les ventes",
+  "WorkOrderItemLaborManualDiscountPct": "Remise manuelle",
+  "WorkOrderItemLaborBasePrice": "Prix de base",
+  "WorkOrderItemLaborPrice": "Prix net",
   "WorkOrderItemLaborUIBankWarning": "Souhaitez-vous réellement déduire cet enregistrement des sommes prépayées ? (L'enregistrement sera bloqué et il ne sera plus possible de le modifier)",
   "WorkOrderItemLaborUIReBankWarning": "Cet élément est déjà déduit des sommes prépayées",
   "WorkOrderItemLaborUserID": "Utilisateur",