admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test-AIO' into feature/IO-2458-RO-Closer

Browse Source 
# Conflicts:
#	client/src/components/job-bills-total/job-bills-total.component.jsx
#	client/src/components/job-costing-statistics/job-costing-statistics.component.jsx
#	client/src/components/job-lifecycle/job-lifecycle.component.jsx
#	client/src/components/job-payments/job-payments.component.jsx
#	client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
#	client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
#	client/src/components/shop-info/shop-info.component.jsx
#	client/src/graphql/bodyshop.queries.js
#	client/src/graphql/jobs.queries.js
#	client/src/pages/jobs-close/jobs-close.component.jsx
#	client/src/utils/instanceRenderMgr.js
This commit is contained in:
Patrick Fic
2024-04-04 11:12:49 -07:00
parent 5e63ce7271 926c13569d
commit c4d39cf3d3
878 changed files with 101740 additions and 115371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/translations/en_us/common.json
View File

@@ -1657,6 +1657,7 @@
"driveable": "Driveable",
"employee_body": "Body",
"employee_csr": "Customer Service Rep.",
"employee_csr_writer": "Writer",
"employee_prep": "Prep",
"employee_refinish": "Refinish",
"est_addr1": "Estimator Address",
@@ -1668,7 +1669,7 @@
"federal_tax_payable": "Federal Tax Payable",
"federal_tax_rate": "Federal Tax Rate",
"ins_addr1": "Insurance Co. Address",
"ins_city": "Insurance City",
"ins_city": "Insurance Co. City",
"ins_co_id": "Insurance Co. ID",
"ins_co_nm": "Insurance Company Name",
"ins_co_nm_short": "Ins. Co.",