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

Merge branch 'feature/IO-2913-ADP-Payroll' into release/2024-09-13

Browse Source 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/translations/en_us/common.json
#	client/src/translations/es/common.json
#	client/src/translations/fr/common.json
This commit is contained in:
Allan Carr
2024-09-12 19:59:47 -07:00
parent 4fdb939bd2 9aa1279144
commit c3bfe87674
3 changed files with 10725 additions and 10719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,12 +285,14 @@
}, },
"appt_length": "Default Appointment Length", "appt_length": "Default Appointment Length",
"attach_pdf_to_email": "Attach PDF copy to sent emails?", "attach_pdf_to_email": "Attach PDF copy to sent emails?",
"batchid": "ADP Batch ID",
"bill_allow_post_to_closed": "Allow Bills to be posted to Closed Jobs", "bill_allow_post_to_closed": "Allow Bills to be posted to Closed Jobs",
"bill_federal_tax_rate": "Bills - Federal Tax Rate %", "bill_federal_tax_rate": "Bills - Federal Tax Rate %",
"bill_local_tax_rate": "Bill - Local Tax Rate %", "bill_local_tax_rate": "Bill - Local Tax Rate %",
"bill_state_tax_rate": "Bill - Provincial/State Tax Rate %", "bill_state_tax_rate": "Bill - Provincial/State Tax Rate %",
"city": "City", "city": "City",
"closingperiod": "Closing Period", "closingperiod": "Closing Period",
"companycode": "ADP Company Code",
"country": "Country", "country": "Country",
"dailybodytarget": "Scoreboard - Daily Body Target", "dailybodytarget": "Scoreboard - Daily Body Target",
"dailypainttarget": "Scoreboard - Daily Paint Target", "dailypainttarget": "Scoreboard - Daily Paint Target",

2
client/src/translations/es/common.json
View File

@@ -285,12 +285,14 @@
}, },
"appt_length": "", "appt_length": "",
"attach_pdf_to_email": "", "attach_pdf_to_email": "",
"batchid": "",
"bill_allow_post_to_closed": "", "bill_allow_post_to_closed": "",
"bill_federal_tax_rate": "", "bill_federal_tax_rate": "",
"bill_local_tax_rate": "", "bill_local_tax_rate": "",
"bill_state_tax_rate": "", "bill_state_tax_rate": "",
"city": "", "city": "",
"closingperiod": "", "closingperiod": "",
"companycode": "",
"country": "", "country": "",
"dailybodytarget": "", "dailybodytarget": "",
"dailypainttarget": "", "dailypainttarget": "",

2
client/src/translations/fr/common.json
View File

@@ -285,12 +285,14 @@
}, },
"appt_length": "", "appt_length": "",
"attach_pdf_to_email": "", "attach_pdf_to_email": "",
"batchid": "",
"bill_allow_post_to_closed": "", "bill_allow_post_to_closed": "",
"bill_federal_tax_rate": "", "bill_federal_tax_rate": "",
"bill_local_tax_rate": "", "bill_local_tax_rate": "",
"bill_state_tax_rate": "", "bill_state_tax_rate": "",
"city": "", "city": "",
"closingperiod": "", "closingperiod": "",
"companycode": "",
"country": "", "country": "",
"dailybodytarget": "", "dailybodytarget": "",
"dailypainttarget": "", "dailypainttarget": "",