diff --git a/.vscode/launch.json b/.vscode/launch.json index f9f41af8..134c77c3 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -48,7 +48,7 @@ "AYANOVA_DATA_PATH": "c:\\temp\\ravendata", "AYANOVA_USE_URLS": "http://*:7575;", //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", - "AYANOVA_SERVER_TEST_MODE": "false", + "AYANOVA_SERVER_TEST_MODE": "true", //"AYANOVA_REPORT_RENDERING_TIMEOUT":"1", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin\\" diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index 6412c535..71aa7949 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -965,7 +965,7 @@ namespace AyaNova.Biz //WORKORDER ITEM LABOR l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStartDate", ModelProperty = "ServiceStartDate", TKeySection = "WorkOrderItemLabor" }); l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStopDate", ModelProperty = "ServiceStopDate", TKeySection = "WorkOrderItemLabor" }); - l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateQuantity", ModelProperty = "ServiceRateQuantity", TKeySection = "WorkOrderItemLabor", Requireable = false }); + //l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateQuantity", ModelProperty = "ServiceRateQuantity", TKeySection = "WorkOrderItemLabor", Requireable = false }); l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateID", TKeySection = "WorkOrderItemLabor", ModelProperty = "ServiceRateId" }); l.Add(new FormField { TKey = "WorkOrderItemLaborServiceDetails", ModelProperty = "ServiceDetails", TKeySection = "WorkOrderItemLabor" }); l.Add(new FormField { TKey = "WorkOrderItemLaborUserID", TKeySection = "WorkOrderItemLabor", ModelProperty = "UserId" }); @@ -1000,7 +1000,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "LineTotal", FieldKey = "TravelLineTotalViz", TKeySection = "WorkOrderItemTravel", Requireable = false }); //WORKORDER ITEM EXPENSES - l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeAmount", TKeySection = "WorkOrderItemExpense", Requireable = false }); + //l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeAmount", TKeySection = "WorkOrderItemExpense", Requireable = false }); l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeTaxCodeID", TKeySection = "WorkOrderItemExpense", ModelProperty = "ChargeTaxCodeId" }); l.Add(new FormField { TKey = "WorkOrderItemExpenseTaxPaid", TKeySection = "WorkOrderItemExpense", ModelProperty = "TaxPaid", Requireable = false }); l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeToCustomer", TKeySection = "WorkOrderItemExpense", Requireable = false }); @@ -1145,7 +1145,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "UnitDescription", TKeySection = "WorkOrderItemUnit", Requireable = false }); l.Add(new FormField { TKey = "Tags", FieldKey = "WorkOrderItemUnitTags", TKeySection = "WorkOrderItemUnit", ModelProperty = "Tags" }); l.Add(new FormField { TKey = "UnitWarrantyInfo", TKeySection = "WorkOrderItemUnit", Requireable = false }); - l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemUnitWiki", TKeySection = "WorkOrderItemUnit", ModelProperty = "Wiki" }); + l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemUnitWiki", TKeySection = "WorkOrderItemUnit", ModelProperty = "Wiki", Requireable = false }); l.Add(new FormField { TKey = "Attachments", FieldKey = "WorkOrderItemUnitAttachments", TKeySection = "WorkOrderItemUnit", Requireable = false }); l.Add(new FormField { TKey = "WorkOrderItemUnitCustom1", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); l.Add(new FormField { TKey = "WorkOrderItemUnitCustom2", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); @@ -1196,7 +1196,7 @@ namespace AyaNova.Biz //QUOTE ITEM LABOR l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStartDate", ModelProperty = "ServiceStartDate", TKeySection = "WorkOrderItemLabor" }); l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStopDate", ModelProperty = "ServiceStopDate", TKeySection = "WorkOrderItemLabor" }); - l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateQuantity", ModelProperty = "ServiceRateQuantity", TKeySection = "WorkOrderItemLabor", Requireable = false }); + // l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateQuantity", ModelProperty = "ServiceRateQuantity", TKeySection = "WorkOrderItemLabor", Requireable = false }); l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateID", TKeySection = "WorkOrderItemLabor", ModelProperty = "ServiceRateId" }); l.Add(new FormField { TKey = "WorkOrderItemLaborServiceDetails", ModelProperty = "ServiceDetails", TKeySection = "WorkOrderItemLabor" }); l.Add(new FormField { TKey = "WorkOrderItemLaborUserID", TKeySection = "WorkOrderItemLabor", ModelProperty = "UserId" }); @@ -1231,7 +1231,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "LineTotal", FieldKey = "TravelLineTotalViz", TKeySection = "WorkOrderItemTravel", Requireable = false }); //QUOTE ITEM EXPENSES - l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeAmount", TKeySection = "WorkOrderItemExpense", Requireable = false }); + //l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeAmount", TKeySection = "WorkOrderItemExpense", Requireable = false }); l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeTaxCodeID", TKeySection = "WorkOrderItemExpense", ModelProperty = "ChargeTaxCodeId" }); l.Add(new FormField { TKey = "WorkOrderItemExpenseTaxPaid", TKeySection = "WorkOrderItemExpense", ModelProperty = "TaxPaid", Requireable = false }); l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeToCustomer", TKeySection = "WorkOrderItemExpense", Requireable = false }); @@ -1412,7 +1412,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "UnitDescription", TKeySection = "WorkOrderItemUnit", Requireable = false }); l.Add(new FormField { TKey = "Tags", FieldKey = "WorkOrderItemUnitTags", TKeySection = "WorkOrderItemUnit", ModelProperty = "Tags" }); l.Add(new FormField { TKey = "UnitWarrantyInfo", TKeySection = "WorkOrderItemUnit", Requireable = false }); - l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemUnitWiki", TKeySection = "WorkOrderItemUnit", ModelProperty = "Wiki" }); + l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemUnitWiki", TKeySection = "WorkOrderItemUnit", ModelProperty = "Wiki", Requireable = false }); l.Add(new FormField { TKey = "Attachments", FieldKey = "WorkOrderItemUnitAttachments", TKeySection = "WorkOrderItemUnit", Requireable = false }); l.Add(new FormField { TKey = "WorkOrderItemUnitCustom1", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); l.Add(new FormField { TKey = "WorkOrderItemUnitCustom2", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); @@ -1463,7 +1463,7 @@ namespace AyaNova.Biz //PM ITEM LABOR l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStartDate", ModelProperty = "ServiceStartDate", TKeySection = "WorkOrderItemLabor" }); l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStopDate", ModelProperty = "ServiceStopDate", TKeySection = "WorkOrderItemLabor" }); - l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateQuantity", ModelProperty = "ServiceRateQuantity", TKeySection = "WorkOrderItemLabor", Requireable = false }); + //l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateQuantity", ModelProperty = "ServiceRateQuantity", TKeySection = "WorkOrderItemLabor", Requireable = false }); l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateID", TKeySection = "WorkOrderItemLabor", ModelProperty = "ServiceRateId" }); l.Add(new FormField { TKey = "WorkOrderItemLaborServiceDetails", ModelProperty = "ServiceDetails", TKeySection = "WorkOrderItemLabor" }); l.Add(new FormField { TKey = "WorkOrderItemLaborUserID", TKeySection = "WorkOrderItemLabor", ModelProperty = "UserId" }); @@ -1498,7 +1498,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "LineTotal", FieldKey = "TravelLineTotalViz", TKeySection = "WorkOrderItemTravel", Requireable = false }); //PM ITEM EXPENSES - l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeAmount", TKeySection = "WorkOrderItemExpense", Requireable = false }); + //l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeAmount", TKeySection = "WorkOrderItemExpense", Requireable = false }); l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeTaxCodeID", TKeySection = "WorkOrderItemExpense", ModelProperty = "ChargeTaxCodeId" }); l.Add(new FormField { TKey = "WorkOrderItemExpenseTaxPaid", TKeySection = "WorkOrderItemExpense", ModelProperty = "TaxPaid", Requireable = false }); l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeToCustomer", TKeySection = "WorkOrderItemExpense", Requireable = false });