Merged in feature/payroll (pull request #914)

Add audit trail and resolve status update.
This commit is contained in:
Patrick Fic
2023-08-01 22:29:49 +00:00
17 changed files with 471 additions and 36 deletions

View File

@@ -103,6 +103,7 @@
"admin_jobmarkforreexport": "ADMIN: Job marked for re-export.",
"admin_jobuninvoice": "ADMIN: Job has been uninvoiced.",
"admin_jobunvoid": "ADMIN: Job has been unvoided.",
"assignedlinehours": "Assigned job lines totaling {{hours}} units to {{team}}.",
"billposted": "Bill with invoice number {{invoice_number}} posted.",
"billupdated": "Bill with invoice number {{invoice_number}} updated.",
"failedpayment": "Failed payment attempt.",
@@ -346,7 +347,7 @@
"md_payment_types": "Payment Types",
"md_referral_sources": "Referral Sources",
"md_tasks_presets": {
"enable_tasks": "Enable Task Claiming",
"enable_tasks": "Enable Hour Flagging",
"hourstype": "Hour Types",
"memo": "Time Ticket Memo",
"name": "Preset Name",
@@ -1746,7 +1747,7 @@
"federal_tax_amt": "Federal Taxes",
"gpdollars": "$ G.P.",
"gppercent": "% G.P.",
"hrs_claimed": "Hours Claimed",
"hrs_claimed": "Hours Flagged",
"hrs_total": "Hours Total",
"importnote": "The job was initially imported.",
"inproduction": "In Production",
@@ -1997,7 +1998,8 @@
"shops": "My Shops"
},
"tech": {
"claimtask": "Claim Task",
"assignedjobs": "Assigned Jobs",
"claimtask": "Flag Hours",
"home": "Home",
"jobclockin": "Job Clock In",
"jobclockout": "Job Clock Out",
@@ -2647,7 +2649,7 @@
"timetickets": "Time Tickets",
"timetickets_employee": "Employee Time Tickets",
"timetickets_summary": "Time Tickets Summary",
"unclaimed_hrs": "Unclaimed Hours",
"unclaimed_hrs": "Unflagged Hours",
"void_ros": "Void ROs",
"work_in_progress_labour": "Work in Progress - Labor",
"work_in_progress_payables": "Work in Progress - Payables"
@@ -2727,7 +2729,7 @@
},
"timetickets": {
"actions": {
"claimtasks": "Claim Tasks",
"claimtasks": "Flag Hours",
"clockin": "Clock In",
"clockout": "Clock Out",
"commit": "Commit Tickets ({{count}})",
@@ -2768,7 +2770,7 @@
"alreadyclockedon": "You are already clocked in to the following job(s):",
"ambreak": "AM Break",
"amshift": "AM Shift",
"claimtaskpreview": "Claimed Tasks Preview",
"claimtaskpreview": "Flagged Hours 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.",

View File

@@ -103,6 +103,7 @@
"admin_jobmarkforreexport": "",
"admin_jobuninvoice": "",
"admin_jobunvoid": "",
"assignedlinehours": "",
"billposted": "",
"billupdated": "",
"failedpayment": "",
@@ -1997,6 +1998,7 @@
"shops": "Mis tiendas"
},
"tech": {
"assignedjobs": "",
"claimtask": "",
"home": "",
"jobclockin": "",

View File

@@ -103,6 +103,7 @@
"admin_jobmarkforreexport": "",
"admin_jobuninvoice": "",
"admin_jobunvoid": "",
"assignedlinehours": "",
"billposted": "",
"billupdated": "",
"failedpayment": "",
@@ -1997,6 +1998,7 @@
"shops": "Mes boutiques"
},
"tech": {
"assignedjobs": "",
"claimtask": "",
"home": "",
"jobclockin": "",