From f698d9e064a2b70abd45e21508dfd714cdd0a2e3 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 9 Jul 2021 20:35:44 +0000 Subject: [PATCH] --- server/AyaNova/DataList/WorkOrderDataList.cs | 2 +- server/AyaNova/resource/en.json | 90 ++++++++++---------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/server/AyaNova/DataList/WorkOrderDataList.cs b/server/AyaNova/DataList/WorkOrderDataList.cs index f17ed680..ec277cf1 100644 --- a/server/AyaNova/DataList/WorkOrderDataList.cs +++ b/server/AyaNova/DataList/WorkOrderDataList.cs @@ -19,7 +19,7 @@ namespace AyaNova.DataList + "left join acontract on (aworkorder.contractid=acontract.id)"; var RoleSet = BizRoles.GetRoleSet(DefaultListAType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; - DefaultColumns = new List() { "WorkOrderSerialNumber", "Customer", "WorkOrderServiceDate", "WorkOrderCloseByDate", "WorkOrderStatus" }; + DefaultColumns = new List() { "WorkOrderSerialNumber", "Customer", "WorkOrderServiceDate", "WorkOrderCloseByDate", "WorkOrderStatus", "Project" }; DefaultSortBy = new Dictionary() { { "WorkOrderSerialNumber", "-" } }; FieldDefinitions = new List(); diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index b41aba13..2f116bf3 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -326,13 +326,13 @@ "GlobalUseNotificationDescription": "If set to TRUE turns on notification system\r\nIf set to FALSE turns off all notification processing.", "GlobalUseRegions": "Use Regions", "GlobalUseRegionsDescription": "If set to TRUE, users assigned to one region will not be able to view information about users assigned to another region", - "GlobalWorkOrderCloseByAge": "WorkOrder stale age (minutes)", + "GlobalWorkOrderCloseByAge": "Work order stale age (minutes)", "GlobalWorkOrderCloseByAgeDescription": "Minutes after a workorder is created that it should be closed. When a work order is created this time span is added to the current date / time to set the close by date automatically. Set to zero if not used.", - "GlobalWorkOrderClosedStatus": "WorkOrder closed status", + "GlobalWorkOrderClosedStatus": "Work order closed status", "GlobalWorkOrderClosedStatusDescription": "If a status is selected here, a work order will be set to this status automatically when closed by a user in AyaNova or AyaNovaWBI", - "GlobalWorkOrderNumberStartSeed": "WorkOrders Start Number", + "GlobalWorkOrderNumberStartSeed": "Work orders Start Number", "GlobalWorkOrderNumberStartSeedDescription": "Service workorder starting number must be greater than existing utilized numbers. Once have entered a number, can not enter a smaller number.", - "GlobalWorkOrderSummaryTemplate": "WorkOrder Item Summary Template", + "GlobalWorkOrderSummaryTemplate": "Work order Item Summary Template", "GlobalWorkOrderSummaryTemplateDescription": "This determines what information from a service workorder item will display on the Schedule screen.", "GridFilterName": "Filter name", "HeadOfficeAccountNumber": "Account Number", @@ -555,20 +555,20 @@ "UserSkill": "User skill", "UserSkillAssigned": "User Skill Assigned", "Vendor": "Vendor", - "WorkOrder": "WorkOrder", + "WorkOrder": "Work order", "WorkOrderClose": "Close work order", - "WorkOrderCategory": "WorkOrder Category", - "WorkOrderItem": "WorkOrder Item", - "WorkOrderItemLabor": "WorkOrder item labor", - "WorkOrderItemLoan": "WorkOrder item loan", - "WorkOrderItemExpense": "WorkOrder item expense", - "WorkOrderItemPart": "WorkOrder item part", - "WorkOrderItemPartRequest": "WorkOrder item part request", - "WorkOrderItemScheduledUser": "WorkOrder item Scheduled User", - "WorkOrderItemTask": "WorkOrder item task", - "WorkOrderItemTravel": "WorkOrder item travel", - "WorkOrderItemType": "WorkOrder Item Type", - "WorkOrderItemUnit": "WorkOrder item unit", + "WorkOrderCategory": "Work order Category", + "WorkOrderItem": "Work order Item", + "WorkOrderItemLabor": "Work order item labor", + "WorkOrderItemLoan": "Work order item loan", + "WorkOrderItemExpense": "Work order item expense", + "WorkOrderItemPart": "Work order item part", + "WorkOrderItemPartRequest": "Work order item part request", + "WorkOrderItemScheduledUser": "Work order item Scheduled User", + "WorkOrderItemTask": "Work order item task", + "WorkOrderItemTravel": "Work order item travel", + "WorkOrderItemType": "Work order Item Type", + "WorkOrderItemUnit": "Work order item unit", "PM": "Preventive maintenance", "PMTemplate": "Preventive maintenance template", "Quote": "Quote", @@ -765,7 +765,7 @@ "PurchaseOrderItemQuantityReceived": "Quantity Received", "PurchaseOrderItemUIOrderedFrom": "Ordered from", "PurchaseOrderItemUISaveWarning": "Are you sure you want to save?\r\nOnce this record is saved it will be locked and can no longer be edited.", - "PurchaseOrderItemWorkOrderNumber": "WorkOrder #", + "PurchaseOrderItemWorkOrderNumber": "Work order #", "PurchaseOrderItemVendorPartNumber": "Vendor number", "PurchaseOrderItemSerialNumbers": "Serial numbers", "PurchaseOrderReceiptItems": "Purchase Order Receipt Items", @@ -781,7 +781,7 @@ "PurchaseOrderReceiptItemReceiptCost": "Received Cost", "PurchaseOrderReceiptItemReferenceNumber": "Reference", "PurchaseOrderReceiptItemWarehouseID": "Part Warehouse", - "PurchaseOrderReceiptItemWorkOrderNumber": "WorkOrder #", + "PurchaseOrderReceiptItemWorkOrderNumber": "Work order #", "PurchaseOrderEdit": "Purchase order edit", "ReceiveAll": "Receive all", "RateAccountNumber": "Account Number", @@ -1092,7 +1092,7 @@ "DayWednesday": "Wednesday", "DayOfWeek": "Day of week", "DeletePrompt": "Are you sure you want to delete this record permanently?", - "DeleteWorkOrderPrompt": "Are you sure you want to delete this WorkOrder permanently?", + "DeleteWorkOrderPrompt": "Are you sure you want to delete this Work order permanently?", "East": "East", "FilterAvailableTo": "Available to", "Filtered": "Filtered", @@ -1174,11 +1174,11 @@ "ScheduleDayView": "Single Day View", "ScheduleEditScheduleableUserGroup": "Edit Scheduleable User Groups", "ScheduleEditReminder": "Edit selected reminder", - "ScheduleEditWorkOrder": "Edit selected WorkOrder", + "ScheduleEditWorkOrder": "Edit selected Work order", "ScheduleMergeUsers": "Display Merged / Separate", "ScheduleMonthView": "Month View", "ScheduleNewReminder": "New reminder", - "ScheduleNewWorkOrder": "New Service WorkOrder", + "ScheduleNewWorkOrder": "New Service Work order", "SchedulePrintWorkOrders": "Print selected work orders", "ScheduleSelectScheduleableUserGroup": "Select Scheduleable Users", "ScheduleShowClosed": "Display Open / Closed (and open) work orders", @@ -1236,7 +1236,7 @@ "UnitUIWarrantiedDisplay": "Unit is warrantied until {0}\r\n\r\nWarranty terms:\r\n=-=-=-=-=-=-=-=-\r\n{1}", "UnitUIWarrantyExpiredDisplay": "Unit's warranty expired {0}", "UnitUnitHasOwnAddress": "Unit Has Own Address", - "UnitWorkOrderLastServicedID": "WorkOrder Last Serviced", + "UnitWorkOrderLastServicedID": "Work order Last Serviced", "UnitMeterReadingDescription": "Meter description", "UnitMeterReadingList": "Unit Meter Reading List", "UnitMeterReadingMeter": "Unit Meter Reading", @@ -1402,9 +1402,9 @@ "WorkOrderPartRequestsOnOrder": "This operation can not be completed - One or more part requests are still on order and not yet received", "WorkOrderPartRequestsUnOrdered": "This operation can not be completed - One or more unordered part requests need to be removed first", "WorkOrderSourceInvalidType": "Source workorder type is not valid", - "WorkOrderEventCloseByDatePassed": "WorkOrder - \"Close By\" date passed", + "WorkOrderEventCloseByDatePassed": "Work order - \"Close By\" date passed", "WorkOrderEventQuoteUpdated": "Quote - created / updated", - "WorkOrderEventStatus": "WorkOrder - \"Status\" changed", + "WorkOrderEventStatus": "Work order - \"Status\" changed", "WorkOrderFormLayoutID": "Form layout ID", "WorkOrderFromPMID": "P.M. parent", "WorkOrderFromQuoteID": "Quote parent", @@ -1415,18 +1415,18 @@ "WorkOrderCompleted": "Service Completed", "WorkOrderSign": "Sign", "WorkOrderSummary": "Summary", - "WorkOrderTemplate": "WorkOrder Template", + "WorkOrderTemplate": "Work order Template", "WorkOrderTemplateDescription": "Template description", "WorkOrderTemplateFreshPrice": "Use current Part prices on generated order", "WorkOrderTemplateID": "Template ID", "WorkOrderWarningClosedChanged": "Warning: If you continue the workorder will be closed permanently. \r\n\r\nAre you sure?", "WorkOrderWarningNotAllPartsUsed": "Warning: One or more parts on this workorder are not set to USED status.\r\n\r\nIf you continue all parts will be set to USED status automatically.\r\n\r\nAre you sure?", "WorkOrderWarningServiceCompletedChanged": "Warning: If you continue this form will be closed and this work order's service completed status changed. \r\n \r\nAre you sure?", - "WorkOrderWorkOrderItems": "WorkOrder Items", + "WorkOrderWorkOrderItems": "Work order Items", "WorkOrderCategoryDescription": "Description", - "WorkOrderCategoryList": "WorkOrder Categories", - "WorkOrderCategoryName": "WorkOrder Category Name", - "WorkOrderDetailsList": "WorkOrder Details", + "WorkOrderCategoryList": "Work order Categories", + "WorkOrderCategoryName": "Work order Category Name", + "WorkOrderDetailsList": "Work order Details", "WorkOrderItemCustom1": "Custom1", "WorkOrderItemCustom2": "Custom2", "WorkOrderItemCustom3": "Custom3", @@ -1444,7 +1444,7 @@ "WorkOrderItemCustom15": "Custom15", "WorkOrderItemCustom16": "Custom16", "WorkOrderItemCustomFields": "Custom Fields", - "WorkOrderItemEventNotServiced": "WorkOrder item - not serviced quickly enough", + "WorkOrderItemEventNotServiced": "Work order item - not serviced quickly enough", "WorkOrderItemExpenses": "Expenses", "WorkOrderItemLabors": "Labor", "WorkOrderItemList": "Items", @@ -1460,9 +1460,9 @@ "WorkOrderItemTasks": "Tasks", "WorkOrderItemTechNotes": "Service Notes", "WorkOrderItemTravels": "Travel", - "WorkOrderItemTypeID": "WorkOrder Item Type", + "WorkOrderItemTypeID": "Work order Item Type", "WorkOrderItemWarrantyService": "Warranty Service", - "WorkOrderItemWorkOrderStatusID": "WorkOrder item status", + "WorkOrderItemWorkOrderStatusID": "Work order item status", "WorkOrderItemLaborBanked": "Banked", "WorkOrderItemLaborRateCharge": "Rate Charge", "WorkOrderItemLaborList": "Labors", @@ -1518,8 +1518,8 @@ "WorkOrderItemOutsideServiceDateETA": "ETA Date", "WorkOrderItemOutsideServiceDateReturned": "Date Returned", "WorkOrderItemOutsideServiceDateSent": "Date Sent", - "WorkOrderItemOutsideServiceEventUnitBackFromService": "WorkOrder item outside service - unit received back", - "WorkOrderItemOutsideServiceEventUnitNotBackFromServiceByETA": "WorkOrder item outside service - unit is overdue", + "WorkOrderItemOutsideServiceEventUnitBackFromService": "Work order item outside service - unit received back", + "WorkOrderItemOutsideServiceEventUnitNotBackFromServiceByETA": "Work order item outside service - unit is overdue", "WorkOrderItemOutsideServiceNotes": "Notes", "WorkOrderItemOutsideServiceReceivedBack": "Received Back", "WorkOrderItemOutsideServiceRepairCost": "Repair Cost", @@ -1550,7 +1550,7 @@ "WorkOrderItemPartWarningInsufficientStock": "Insufficient stock ({0:N}).\r\nDo you want to request {1:N}?", "WorkOrderItemPartWarningPartNotFound": "Part not found in parts list", "WorkOrderItemPartRequestNotDeleteableOnOrder": "A workorder item part request can not be deleted when parts are on order. Once parts are received it may be deleted.", - "WorkOrderItemPartRequestEventPartsReceived": "WorkOrder item part request - PartsReceived", + "WorkOrderItemPartRequestEventPartsReceived": "Work order item part request - PartsReceived", "WorkOrderItemPartRequestList": "Part requests", "WorkOrderItemPartRequestOnOrder": "On order", "WorkOrderItemPartRequestPartID": "Part", @@ -1573,7 +1573,7 @@ "WorkOrderItemTaskCompletionTypeIncomplete": "To Do", "WorkOrderItemTaskCompletionTypeNotApplicable": "N/A", "WorkOrderItemTaskCompletionTypeFailed": "Failed", - "WorkOrderItemTaskObject": "WorkOrder item task", + "WorkOrderItemTaskObject": "Work order item task", "WorkOrderItemTaskTaskID": "Task", "WorkOrderItemTaskWorkOrderItemTaskCompletionType": "Status", "WorkOrderItemTaskUser": "User", @@ -1593,10 +1593,10 @@ "WorkOrderItemTravelStopDate": "Stop Date", "WorkOrderItemTravelUserID": "User", "WorkOrderItemTypeDescription": "Description", - "WorkOrderItemTypeList": "WorkOrder Item Types", - "WorkOrderItemTypeName": "WorkOrder Item Type Name", + "WorkOrderItemTypeList": "Work order Item Types", + "WorkOrderItemTypeName": "Work order Item Type Name", "PMDayOfTheWeek": "Desired Day of the Week", - "PMGenerateServiceWorkOrder": "Manually Generate Service WorkOrder", + "PMGenerateServiceWorkOrder": "Manually Generate Service Work order", "PMGenerateSpan": "Generate time span", "PMGenerateSpanUnit": "Generate", "PMList": "Preventive maintenance", @@ -1607,14 +1607,14 @@ "PMByUnitList": "Preventive Maintenance By Unit", "QuoteDateApproved": "Approved", "QuoteDateSubmitted": "Submitted", - "QuoteGenerateServiceWorkOrder": "Generate Service WorkOrder from this Quote", + "QuoteGenerateServiceWorkOrder": "Generate Service Work order from this Quote", "QuoteIntroduction": "Introductory Text", "QuoteList": "Quotes", "QuotePreparedByID": "Prepared by User", "QuoteQuoteNumber": "Quote Number", "QuoteQuoteRequestDate": "Requested", "QuoteQuoteStatusType": "Status", - "QuoteServiceWorkOrderID": "Service WorkOrder", + "QuoteServiceWorkOrderID": "Service Work order", "QuoteValidUntilDate": "Valid Until", "QuoteStatusTypesAwarded": "Awarded", "QuoteStatusTypesInProgress": "In progress", @@ -1626,7 +1626,7 @@ "WorkOrderCustomerRequestID": "Customer Request Reference", "WorkOrderCloseByDate": "Date to be completed", "WorkOrderInvoiceNumber": "Invoice Number", - "WorkOrderList": "WorkOrders", + "WorkOrderList": "Work orders", "WorkOrderQuoteWorkOrderID": "Quote", "WorkOrderServiceDate": "Service Date", "WorkOrderServiceDateRelative": "Service date (relative)", @@ -1644,8 +1644,8 @@ "WorkOrderStatusCompleted": "Is a completed status", "WorkOrderStatusLocked": "Is a locking status", "WorkOrderStatusUnderlined": "Underlined", - "WorkOrderSummaryTemplate": "WorkOrder Item Summary Template", - "WorkOrderSummaryWorkOrderItem": "WorkOrder Item Info To Display", + "WorkOrderSummaryTemplate": "Work order Item Summary Template", + "WorkOrderSummaryWorkOrderItem": "Work order Item Info To Display", "Dispatch": "Dispatch", "Accounting": "Accounting", "Operations": "Server operations",