This commit is contained in:
2021-05-10 23:33:41 +00:00
parent 80668f6c0e
commit 32db0a862b
5 changed files with 60 additions and 38 deletions

View File

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

View File

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

View File

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

View File

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

View File

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