Merge branch 'feature/payroll' into feature/america

This commit is contained in:
Patrick Fic
2023-08-18 07:47:08 -07:00
6 changed files with 237 additions and 9 deletions

View File

@@ -614,6 +614,7 @@
"laborrates": "Labor Rates",
"licensing": "Licensing",
"md_tasks_presets": "Tasks Presets",
"md_parts_scan": "Parts Scan Rules",
"md_to_emails": "Preset To Emails",
"md_to_emails_emails": "Emails",
"messagingpresets": "Messaging Presets",
@@ -2343,6 +2344,7 @@
"appointment_confirmation": "Appointment Confirmation",
"appointment_reminder": "Appointment Reminder",
"casl_authorization": "CASL Authorization",
"committed_timetickets_ro": "Committed Time Tickets",
"coversheet_landscape": "Coversheet (Landscape)",
"coversheet_portrait": "Coversheet Portrait",
"csi_invitation": "CSI Invitation",
@@ -2380,6 +2382,7 @@
"mpi_final_acct_sheet": "MPI - Final Accounting Sheet (Direct Repair)",
"mpi_final_repair_acct_sheet": "MPI - Final Accounting Sheet",
"paint_grid": "Paint Grid",
"parts_dispatch": "Parts Dispatch",
"parts_invoice_label_single": "Parts Label Single",
"parts_label_multiple": "Parts Label - Multi",
"parts_label_single": "Parts Label - Single",
@@ -2414,7 +2417,8 @@
"worksheet_sorted_by_operation": "Worksheet by Operation",
"worksheet_sorted_by_operation_no_hours": "Worksheet by Operation (No Hours)",
"worksheet_sorted_by_operation_part_type": "Worksheet by Operation & Part Type",
"worksheet_sorted_by_operation_type": "Worksheet by Operation Type"
"worksheet_sorted_by_operation_type": "Worksheet by Operation Type",
"worksheet_sorted_by_team": "Worksheet by Team"
},
"labels": {
"groups": {
@@ -2441,6 +2445,7 @@
"subjects": {
"jobs": {
"individual_job_note": "Job Note RO: {{ro_number}}",
"parts_dispatch": "Parts Dispatch RO: {{ro_number}}",
"parts_order": "Parts Order PO: {{ro_number}} - {{name}}",
"parts_return_slip": "Parts Return PO: {{ro_number}} - {{name}}",
"sublet_order": "Sublet Order PO: {{ro_number}} - {{name}}"
@@ -2561,6 +2566,9 @@
"attendance_detail": "Attendance (All Employees)",
"attendance_employee": "Employee Attendance",
"attendance_summary": "Attendance Summary (All Employees)",
"committed_timetickets": "Committed Time Tickets",
"committed_timetickets_employee": "Committed Employee Time Tickets",
"committed_timetickets_summary": "Committed Time Tickets Summary",
"credits_not_received_date": "Credits not Received by Date",
"credits_not_received_date_vendorid": "Credits not Received by Vendor",
"csi": "CSI Responses",
@@ -2659,6 +2667,7 @@
"timetickets_summary": "Time Tickets Summary",
"unclaimed_hrs": "Unflagged Hours",
"void_ros": "Void ROs",
"work_in_progress_committed_labour": "Work in Progress - Committed Labor",
"work_in_progress_jobs": "Work in Progress - Jobs",
"work_in_progress_labour": "Work in Progress - Labor",
"work_in_progress_payables": "Work in Progress - Payables"
@@ -2765,6 +2774,7 @@
"clockoff": "Clock Off",
"clockon": "Clocked In",
"committed": "Committed",
"committed_at": "Committed At",
"cost_center": "Cost Center",
"created_by": "Created By",
"date": "Ticket Date",

View File

@@ -613,6 +613,7 @@
"jobstatuses": "",
"laborrates": "",
"licensing": "",
"md_parts_scan": "",
"md_tasks_presets": "",
"md_to_emails": "",
"md_to_emails_emails": "",
@@ -2343,6 +2344,7 @@
"appointment_confirmation": "",
"appointment_reminder": "",
"casl_authorization": "",
"committed_timetickets_ro": "",
"coversheet_landscape": "",
"coversheet_portrait": "",
"csi_invitation": "",
@@ -2380,6 +2382,7 @@
"mpi_final_acct_sheet": "",
"mpi_final_repair_acct_sheet": "",
"paint_grid": "",
"parts_dispatch": "",
"parts_invoice_label_single": "",
"parts_label_multiple": "",
"parts_label_single": "",
@@ -2414,7 +2417,8 @@
"worksheet_sorted_by_operation": "",
"worksheet_sorted_by_operation_no_hours": "",
"worksheet_sorted_by_operation_part_type": "",
"worksheet_sorted_by_operation_type": ""
"worksheet_sorted_by_operation_type": "",
"worksheet_sorted_by_team": ""
},
"labels": {
"groups": {
@@ -2441,6 +2445,7 @@
"subjects": {
"jobs": {
"individual_job_note": "",
"parts_dispatch": "",
"parts_order": "",
"parts_return_slip": "",
"sublet_order": ""
@@ -2561,6 +2566,9 @@
"attendance_detail": "",
"attendance_employee": "",
"attendance_summary": "",
"committed_timetickets": "",
"committed_timetickets_employee": "",
"committed_timetickets_summary": "",
"credits_not_received_date": "",
"credits_not_received_date_vendorid": "",
"csi": "",
@@ -2659,6 +2667,7 @@
"timetickets_summary": "",
"unclaimed_hrs": "",
"void_ros": "",
"work_in_progress_committed_labour": "",
"work_in_progress_jobs": "",
"work_in_progress_labour": "",
"work_in_progress_payables": ""
@@ -2765,6 +2774,7 @@
"clockoff": "",
"clockon": "",
"committed": "",
"committed_at": "",
"cost_center": "",
"created_by": "",
"date": "",

View File

@@ -613,6 +613,7 @@
"jobstatuses": "",
"laborrates": "",
"licensing": "",
"md_parts_scan": "",
"md_tasks_presets": "",
"md_to_emails": "",
"md_to_emails_emails": "",
@@ -2343,6 +2344,7 @@
"appointment_confirmation": "",
"appointment_reminder": "",
"casl_authorization": "",
"committed_timetickets_ro": "",
"coversheet_landscape": "",
"coversheet_portrait": "",
"csi_invitation": "",
@@ -2380,6 +2382,7 @@
"mpi_final_acct_sheet": "",
"mpi_final_repair_acct_sheet": "",
"paint_grid": "",
"parts_dispatch": "",
"parts_invoice_label_single": "",
"parts_label_multiple": "",
"parts_label_single": "",
@@ -2414,7 +2417,8 @@
"worksheet_sorted_by_operation": "",
"worksheet_sorted_by_operation_no_hours": "",
"worksheet_sorted_by_operation_part_type": "",
"worksheet_sorted_by_operation_type": ""
"worksheet_sorted_by_operation_type": "",
"worksheet_sorted_by_team": ""
},
"labels": {
"groups": {
@@ -2441,6 +2445,7 @@
"subjects": {
"jobs": {
"individual_job_note": "",
"parts_dispatch": "",
"parts_order": "",
"parts_return_slip": "",
"sublet_order": ""
@@ -2561,6 +2566,9 @@
"attendance_detail": "",
"attendance_employee": "",
"attendance_summary": "",
"committed_timetickets": "",
"committed_timetickets_employee": "",
"committed_timetickets_summary": "",
"credits_not_received_date": "",
"credits_not_received_date_vendorid": "",
"csi": "",
@@ -2659,6 +2667,7 @@
"timetickets_summary": "",
"unclaimed_hrs": "",
"void_ros": "",
"work_in_progress_committed_labour": "",
"work_in_progress_jobs": "",
"work_in_progress_labour": "",
"work_in_progress_payables": ""
@@ -2765,6 +2774,7 @@
"clockoff": "",
"clockon": "",
"committed": "",
"committed_at": "",
"cost_center": "",
"created_by": "",
"date": "",