Merge branch 'feature/payroll' into feature/america

client/src/translations/en_us/common.json

@@ -101,6 +101,7 @@
 			"messages": {
 				"admin_jobmarkexported": "ADMIN: Job marked as exported.",
 				"admin_jobmarkforreexport": "ADMIN: Job marked for re-export.",
+				"admin_jobuninvoice": "ADMIN: Job has been uninvoiced.",
 				"admin_jobunvoid": "ADMIN: Job has been unvoided.",
 				"billposted": "Bill with invoice number {{invoice_number}} posted.",
 				"billupdated": "Bill with invoice number {{invoice_number}} updated.",
@@ -349,6 +350,7 @@
 					"hourstype": "Hour Types",
 					"memo": "Time Ticket Memo",
 					"name": "Preset Name",
+					"nextstatus": "Next Status",
 					"percent": "Percent",
 					"use_approvals": "Use Time Ticket Approval Queue"
 				},
@@ -1214,7 +1216,9 @@
 		},
 		"joblines": {
 			"actions": {
+				"assign_team": "Assign Team",
 				"converttolabor": "Convert amount to Labor.",
+				"dispatchparts": "Dispatch Parts ({{count}})",
 				"new": "New Line"
 			},
 			"errors": {
@@ -1224,6 +1228,7 @@
 			"fields": {
 				"act_price": "Retail Price",
 				"ah_detail_line": "Mark as Detail Labor Line (Autohouse Only)",
+				"assigned_team": "Team",
 				"db_price": "List Price",
 				"lbr_types": {
 					"LA1": "LA1",
@@ -1441,6 +1446,7 @@
 				"date_repairstarted": "Repairs Started",
 				"date_scheduled": "Scheduled",
 				"date_towin": "Towed In",
+				"date_void": "Void",
 				"ded_amt": "Deductible",
 				"ded_note": "Deductible Note",
 				"ded_status": "Deductible Status",
@@ -1991,6 +1997,7 @@
 				"shops": "My Shops"
 			},
 			"tech": {
+				"claimtask": "Claim Task",
 				"home": "Home",
 				"jobclockin": "Job Clock In",
 				"jobclockout": "Job Clock Out",
@@ -2131,6 +2138,23 @@
 				"orderinhouse": "Order as In House"
 			}
 		},
+		"parts_dispatch": {
+			"errors": {
+				"creating": "Error dispatching parts. {{error}}"
+			},
+			"fields": {
+				"number": "Number",
+				"percent_accepted": "% Accepted"
+			},
+			"labels": {
+				"parts_dispatch": "Parts Dispatch"
+			}
+		},
+		"parts_dispatch_lines": {
+			"fields": {
+				"accepted_at": "Accepted At"
+			}
+		},
 		"parts_orders": {
 			"actions": {
 				"backordered": "Mark Backordered",
@@ -2408,6 +2432,7 @@
 				"jobs": {
 					"individual_job_note": "Job Note 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}}"
 				}
 			},
@@ -2708,6 +2733,7 @@
 				"commit": "Commit Tickets ({{count}})",
 				"commitone": "Commit",
 				"enter": "Enter New Time Ticket",
+				"payall": "Pay All",
 				"printemployee": "Print Time Tickets",
 				"uncommit": "Uncommit"
 			},
@@ -2735,12 +2761,14 @@
 				"flat_rate": "Flat Rate?",
 				"memo": "Memo",
 				"productivehrs": "Productive Hours",
-				"ro_number": "Job to Post Against"
+				"ro_number": "Job to Post Against",
+				"task_name": "Task"
 			},
 			"labels": {
 				"alreadyclockedon": "You are already clocked in to the following job(s):",
 				"ambreak": "AM Break",
 				"amshift": "AM Shift",
+				"claimtaskpreview": "Claimed Tasks Preview",
 				"clockhours": "Shift Clock Hours Summary",
 				"clockintojob": "Clock In to Job",
 				"deleteconfirm": "Are you sure you want to delete this time ticket? This cannot be undone.",
@@ -2750,12 +2778,15 @@
 				"jobhours": "Job Related Time Tickets Summary",
 				"lunch": "Lunch",
 				"new": "New Time Ticket",
+				"payrollclaimedtasks": "These time tickets will be automatically entered to the system as a part of claiming this task. These numbers are calculated using the jobs assigned lines. If lines are unassigned, they will be excluded from created tickets.",
 				"pmbreak": "PM Break",
 				"pmshift": "PM Shift",
 				"shift": "Shift",
 				"shiftalreadyclockedon": "Active Shift Time Tickets",
 				"straight_time": "Straight Time",
+				"task": "Task",
 				"timetickets": "Time Tickets",
+				"unassigned": "Unassigned",
 				"zeroactualnegativeprod": "Actual hours must be 0 if entering negative productive hours."
 			},
 			"successes": {
@@ -2768,7 +2799,8 @@
 			"validation": {
 				"clockoffmustbeafterclockon": "Clock off time must be the same or after clock in time.",
 				"clockoffwithoutclockon": "Clock off time cannot be set without a clock in time.",
-				"hoursenteredmorethanavailable": "The number of hours entered is more than what is available for this cost center."
+				"hoursenteredmorethanavailable": "The number of hours entered is more than what is available for this cost center.",
+				"unassignedlines": "There are currently {{unassignedHours}} hours of repair lines that are unassigned. These hours are not including in the above calculations and must be paid manually."
 			}
 		},
 		"titles": {

client/src/translations/es/common.json

@@ -101,6 +101,7 @@
 			"messages": {
 				"admin_jobmarkexported": "",
 				"admin_jobmarkforreexport": "",
+				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
 				"billposted": "",
 				"billupdated": "",
@@ -349,6 +350,7 @@
 					"hourstype": "",
 					"memo": "",
 					"name": "",
+					"nextstatus": "",
 					"percent": "",
 					"use_approvals": ""
 				},
@@ -1214,7 +1216,9 @@
 		},
 		"joblines": {
 			"actions": {
+				"assign_team": "",
 				"converttolabor": "",
+				"dispatchparts": "",
 				"new": ""
 			},
 			"errors": {
@@ -1224,6 +1228,7 @@
 			"fields": {
 				"act_price": "Precio actual",
 				"ah_detail_line": "",
+				"assigned_team": "",
 				"db_price": "Precio de base de datos",
 				"lbr_types": {
 					"LA1": "",
@@ -1441,6 +1446,7 @@
 				"date_repairstarted": "",
 				"date_scheduled": "Programado",
 				"date_towin": "",
+				"date_void": "",
 				"ded_amt": "Deducible",
 				"ded_note": "",
 				"ded_status": "Estado deducible",
@@ -1991,6 +1997,7 @@
 				"shops": "Mis tiendas"
 			},
 			"tech": {
+				"claimtask": "",
 				"home": "",
 				"jobclockin": "",
 				"jobclockout": "",
@@ -2131,6 +2138,23 @@
 				"orderinhouse": ""
 			}
 		},
+		"parts_dispatch": {
+			"errors": {
+				"creating": ""
+			},
+			"fields": {
+				"number": "",
+				"percent_accepted": ""
+			},
+			"labels": {
+				"parts_dispatch": ""
+			}
+		},
+		"parts_dispatch_lines": {
+			"fields": {
+				"accepted_at": ""
+			}
+		},
 		"parts_orders": {
 			"actions": {
 				"backordered": "",
@@ -2408,6 +2432,7 @@
 				"jobs": {
 					"individual_job_note": "",
 					"parts_order": "",
+					"parts_return_slip": "",
 					"sublet_order": ""
 				}
 			},
@@ -2708,6 +2733,7 @@
 				"commit": "",
 				"commitone": "",
 				"enter": "",
+				"payall": "",
 				"printemployee": "",
 				"uncommit": ""
 			},
@@ -2735,12 +2761,14 @@
 				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
-				"ro_number": ""
+				"ro_number": "",
+				"task_name": ""
 			},
 			"labels": {
 				"alreadyclockedon": "",
 				"ambreak": "",
 				"amshift": "",
+				"claimtaskpreview": "",
 				"clockhours": "",
 				"clockintojob": "",
 				"deleteconfirm": "",
@@ -2750,12 +2778,15 @@
 				"jobhours": "",
 				"lunch": "",
 				"new": "",
+				"payrollclaimedtasks": "",
 				"pmbreak": "",
 				"pmshift": "",
 				"shift": "",
 				"shiftalreadyclockedon": "",
 				"straight_time": "",
+				"task": "",
 				"timetickets": "",
+				"unassigned": "",
 				"zeroactualnegativeprod": ""
 			},
 			"successes": {
@@ -2768,7 +2799,8 @@
 			"validation": {
 				"clockoffmustbeafterclockon": "",
 				"clockoffwithoutclockon": "",
-				"hoursenteredmorethanavailable": ""
+				"hoursenteredmorethanavailable": "",
+				"unassignedlines": ""
 			}
 		},
 		"titles": {

client/src/translations/fr/common.json

@@ -101,6 +101,7 @@
 			"messages": {
 				"admin_jobmarkexported": "",
 				"admin_jobmarkforreexport": "",
+				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
 				"billposted": "",
 				"billupdated": "",
@@ -349,6 +350,7 @@
 					"hourstype": "",
 					"memo": "",
 					"name": "",
+					"nextstatus": "",
 					"percent": "",
 					"use_approvals": ""
 				},
@@ -1214,7 +1216,9 @@
 		},
 		"joblines": {
 			"actions": {
+				"assign_team": "",
 				"converttolabor": "",
+				"dispatchparts": "",
 				"new": ""
 			},
 			"errors": {
@@ -1224,6 +1228,7 @@
 			"fields": {
 				"act_price": "Prix actuel",
 				"ah_detail_line": "",
+				"assigned_team": "",
 				"db_price": "Prix de la base de données",
 				"lbr_types": {
 					"LA1": "",
@@ -1441,6 +1446,7 @@
 				"date_repairstarted": "",
 				"date_scheduled": "Prévu",
 				"date_towin": "",
+				"date_void": "",
 				"ded_amt": "Déductible",
 				"ded_note": "",
 				"ded_status": "Statut de franchise",
@@ -1991,6 +1997,7 @@
 				"shops": "Mes boutiques"
 			},
 			"tech": {
+				"claimtask": "",
 				"home": "",
 				"jobclockin": "",
 				"jobclockout": "",
@@ -2131,6 +2138,23 @@
 				"orderinhouse": ""
 			}
 		},
+		"parts_dispatch": {
+			"errors": {
+				"creating": ""
+			},
+			"fields": {
+				"number": "",
+				"percent_accepted": ""
+			},
+			"labels": {
+				"parts_dispatch": ""
+			}
+		},
+		"parts_dispatch_lines": {
+			"fields": {
+				"accepted_at": ""
+			}
+		},
 		"parts_orders": {
 			"actions": {
 				"backordered": "",
@@ -2408,6 +2432,7 @@
 				"jobs": {
 					"individual_job_note": "",
 					"parts_order": "",
+					"parts_return_slip": "",
 					"sublet_order": ""
 				}
 			},
@@ -2708,6 +2733,7 @@
 				"commit": "",
 				"commitone": "",
 				"enter": "",
+				"payall": "",
 				"printemployee": "",
 				"uncommit": ""
 			},
@@ -2735,12 +2761,14 @@
 				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
-				"ro_number": ""
+				"ro_number": "",
+				"task_name": ""
 			},
 			"labels": {
 				"alreadyclockedon": "",
 				"ambreak": "",
 				"amshift": "",
+				"claimtaskpreview": "",
 				"clockhours": "",
 				"clockintojob": "",
 				"deleteconfirm": "",
@@ -2750,12 +2778,15 @@
 				"jobhours": "",
 				"lunch": "",
 				"new": "",
+				"payrollclaimedtasks": "",
 				"pmbreak": "",
 				"pmshift": "",
 				"shift": "",
 				"shiftalreadyclockedon": "",
 				"straight_time": "",
+				"task": "",
 				"timetickets": "",
+				"unassigned": "",
 				"zeroactualnegativeprod": ""
 			},
 			"successes": {
@@ -2768,7 +2799,8 @@
 			"validation": {
 				"clockoffmustbeafterclockon": "",
 				"clockoffwithoutclockon": "",
-				"hoursenteredmorethanavailable": ""
+				"hoursenteredmorethanavailable": "",
+				"unassignedlines": ""
 			}
 		},
 		"titles": {