diff --git a/hrms/hooks.py b/hrms/hooks.py index 69f4088ee7d..fdfd4f8a773 100644 --- a/hrms/hooks.py +++ b/hrms/hooks.py @@ -294,6 +294,8 @@ bank_reconciliation_doctypes = ["Expense Claim"] +audit_trail_doctypes = ["Expense Claim", "Payroll Entry", "Salary Slip", "Leave Encashment", "Gratuity"] + # Testing # ------- diff --git a/hrms/hr/doctype/expense_claim/expense_claim.py b/hrms/hr/doctype/expense_claim/expense_claim.py index 07b25b3c5c6..360f18f4b8b 100644 --- a/hrms/hr/doctype/expense_claim/expense_claim.py +++ b/hrms/hr/doctype/expense_claim/expense_claim.py @@ -426,7 +426,7 @@ def create_exchange_gain_loss_je(self): per_advance_gain_loss = 0 total_advance_exchange_gain_loss = 0 for advance in self.advances: - if advance.base_allocated_amount and self.base_total_advance_amount: + if advance.exchange_rate and advance.base_allocated_amount and self.base_total_advance_amount: allocated_amount_in_adv_exchange_rate = flt(advance.allocated_amount) * flt( advance.exchange_rate ) diff --git a/hrms/hr/doctype/expense_claim/test_expense_claim.py b/hrms/hr/doctype/expense_claim/test_expense_claim.py index c2969f251ed..19dfad28fb9 100644 --- a/hrms/hr/doctype/expense_claim/test_expense_claim.py +++ b/hrms/hr/doctype/expense_claim/test_expense_claim.py @@ -1118,6 +1118,43 @@ def test_advance_claim_multicurrency_gain_loss(self): self.assertEqual(gain_loss_jv.total_debit, 2100) self.assertEqual(gain_loss_jv.total_credit, 2100) + def test_no_exchange_gain_loss_when_advance_exchange_rate_missing(self): + from hrms.hr.doctype.employee_advance.test_employee_advance import ( + get_advances_for_claim, + make_employee_advance, + make_payment_entry, + ) + + employee = make_employee("test_advance_claim_missing_exchange_rate@example.com", "_Test Company") + advance = make_employee_advance(employee) + self.assertEqual(advance.status, "Unpaid") + + make_payment_entry(advance, advance.advance_amount) + advance.reload() + self.assertEqual(advance.status, "Paid") + + claim = make_expense_claim( + get_payable_account("_Test Company"), + advance.advance_amount, + advance.advance_amount, + "_Test Company", + "Travel Expenses - _TC", + employee=employee, + do_not_submit=True, + ) + + claim = get_advances_for_claim(claim, advance.name) + for claim_advance in claim.advances: + claim_advance.exchange_rate = 0 + + claim.save().submit() + claim.reload() + + for claim_advance in claim.advances: + self.assertEqual(claim_advance.exchange_gain_loss, 0) + self.assertEqual(claim.total_exchange_gain_loss, 0) + self.assertFalse(claim.gain_loss_account) + def test_expense_claim_status_as_payment_after_unreconciliation(self): from hrms.hr.doctype.employee_advance.test_employee_advance import make_payment_entry diff --git a/hrms/locale/main.pot b/hrms/locale/main.pot index 1aa45b1ef72..12e81fde160 100644 --- a/hrms/locale/main.pot +++ b/hrms/locale/main.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Frappe HR VERSION\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-08-16 09:40+0000\n" -"PO-Revision-Date: 2026-08-16 09:40+0000\n" +"POT-Creation-Date: 2026-08-30 09:33+0000\n" +"PO-Revision-Date: 2026-08-30 09:33+0000\n" "Last-Translator: contact@frappe.io\n" "Language-Team: contact@frappe.io\n" "MIME-Version: 1.0\n" @@ -288,16 +288,6 @@ msgstr "" msgid "
" msgstr "" -#. Header text in the Payroll Workspace -#: hrms/payroll/workspace/payroll/payroll.json -msgid "Transactions & Reports" -msgstr "" - -#. Header text in the Shift & Attendance Workspace -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json -msgid "Masters & Reports" -msgstr "" - #: hrms/public/js/utils/index.js:166 msgid "" msgstr "" @@ -363,13 +353,6 @@ msgstr "" msgid "Accounting & Payment" msgstr "" -#. Label of a Card Break in the Expenses Workspace -#. Label of a Card Break in the Payroll Workspace -#: hrms/hr/workspace/expenses/expenses.json -#: hrms/payroll/workspace/payroll/payroll.json -msgid "Accounting Reports" -msgstr "" - #: hrms/payroll/doctype/salary_component/salary_component.py:105 msgid "Accounts not set for Salary Component {0}" msgstr "" @@ -426,8 +409,10 @@ msgid "Accrued Benefits" msgstr "" #. Name of a report +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/payroll/report/accrued_earnings_report/accrued_earnings_report.json +#: hrms/tax_and_benefits/sidebar/tax_&_benefits/tax_&_benefits.json #: hrms/workspace_sidebar/tax_&_benefits.json msgid "Accrued Earnings Report" msgstr "" @@ -511,7 +496,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1692 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1704 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -535,14 +520,12 @@ msgid "Additional PF" msgstr "" #. Label of the additional_salary (Link) field in DocType 'Leave Encashment' -#. Label of a Link in the Expenses Workspace #. Name of a DocType -#. Label of a Link in the Payroll Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/leave_encashment/leave_encashment.json -#: hrms/hr/workspace/expenses/expenses.json #: hrms/payroll/doctype/additional_salary/additional_salary.json -#: hrms/payroll/workspace/payroll/payroll.json +#: hrms/payroll/sidebar/payroll/payroll.json #: hrms/workspace_sidebar/payroll.json msgid "Additional Salary" msgstr "" @@ -786,7 +769,7 @@ msgstr "" msgid "Alternating entries as IN and OUT during the same shift" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:83 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:84 msgid "Amount Based on Formula" msgstr "" @@ -800,7 +783,7 @@ msgstr "" #. Detail' #: hrms/payroll/doctype/salary_component/salary_component.json #: hrms/payroll/doctype/salary_detail/salary_detail.json -#: hrms/payroll/doctype/salary_structure/salary_structure.py:142 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:143 msgid "Amount based on formula" msgstr "" @@ -935,11 +918,6 @@ msgstr "" msgid "Applicant name" msgstr "" -#. Label of a Card Break in the Leaves Workspace -#: hrms/hr/workspace/leaves/leaves.json -msgid "Application" -msgstr "" - #: hrms/hr/report/recruitment_analytics/recruitment_analytics.py:46 msgid "Application Status" msgstr "" @@ -998,10 +976,10 @@ msgid "Appointment Date" msgstr "" #. Name of a DocType -#. Label of a Link in the Recruitment Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/appointment_letter/appointment_letter.json -#: hrms/hr/workspace/recruitment/recruitment.json +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Appointment Letter" msgstr "" @@ -1009,11 +987,11 @@ msgstr "" #. Label of the appointment_letter_template (Link) field in DocType #. 'Appointment Letter' #. Name of a DocType -#. Label of a Link in the Recruitment Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/appointment_letter/appointment_letter.json #: hrms/hr/doctype/appointment_letter_template/appointment_letter_template.json -#: hrms/hr/workspace/recruitment/recruitment.json +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Appointment Letter Template" msgstr "" @@ -1026,10 +1004,12 @@ msgstr "" #. Name of a DocType #. Label of the appraisal (Link) field in DocType 'Employee Performance #. Feedback' +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/appraisal/appraisal.json #: hrms/hr/doctype/employee_performance_feedback/employee_performance_feedback.json #: hrms/hr/report/appraisal_overview/appraisal_overview.py:44 +#: hrms/performance/sidebar/performance/performance.json #: hrms/workspace_sidebar/performance.json msgid "Appraisal" msgstr "" @@ -1039,6 +1019,7 @@ msgstr "" #. Label of the appraisal_cycle (Link) field in DocType 'Employee Performance #. Feedback' #. Label of the appraisal_cycle (Link) field in DocType 'Goal' +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/appraisal/appraisal.json #: hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json @@ -1047,6 +1028,7 @@ msgstr "" #: hrms/hr/doctype/goal/goal_tree.js:105 #: hrms/hr/report/appraisal_overview/appraisal_overview.js:18 #: hrms/hr/report/appraisal_overview/appraisal_overview.py:37 +#: hrms/performance/sidebar/performance/performance.json #: hrms/workspace_sidebar/performance.json msgid "Appraisal Cycle" msgstr "" @@ -1067,10 +1049,12 @@ msgid "Appraisal Linking" msgstr "" #. Name of a report +#. Label of a Sidebar Item #. Label of a chart in the Performance Workspace #. Label of a Workspace Sidebar Item #: hrms/hr/report/appraisal_overview/appraisal_overview.json -#: hrms/hr/workspace/performance/performance.json +#: hrms/performance/sidebar/performance/performance.json +#: hrms/performance/workspace/performance/performance.json #: hrms/workspace_sidebar/performance.json msgid "Appraisal Overview" msgstr "" @@ -1078,10 +1062,12 @@ msgstr "" #. Label of the appraisal_template (Link) field in DocType 'Appraisal' #. Name of a DocType #. Label of the appraisal_template (Link) field in DocType 'Appraisee' +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/appraisal/appraisal.json #: hrms/hr/doctype/appraisal_template/appraisal_template.json -#: hrms/hr/doctype/appraisee/appraisee.json hrms/setup.py:219 +#: hrms/hr/doctype/appraisee/appraisee.json +#: hrms/performance/sidebar/performance/performance.json hrms/setup.py:219 #: hrms/workspace_sidebar/performance.json msgid "Appraisal Template" msgstr "" @@ -1116,6 +1102,11 @@ msgstr "" msgid "Appraisal {0} does not belong to Employee {1}" msgstr "" +#. Label of a number card in the Performance Workspace +#: hrms/performance/workspace/performance/performance.json +msgid "Appraisals (This Year)" +msgstr "" + #. Name of a DocType #: hrms/hr/doctype/appraisee/appraisee.json msgid "Appraisee" @@ -1161,6 +1152,11 @@ msgstr "" msgid "Approved" msgstr "" +#. Label of a number card in the Expenses Workspace +#: hrms/expenses/workspace/expenses/expenses.json +msgid "Approved Claims (This Month)" +msgstr "" + #. Label of the approver (Link) field in DocType 'Department Approver' #. Label of the approver (Link) field in DocType 'Shift Assignment Tool' #. Label of the approver (Link) field in DocType 'Shift Request' @@ -1266,7 +1262,7 @@ msgstr "" msgid "Assigning Structure..." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:285 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:287 msgid "Assigning Structures..." msgstr "" @@ -1327,17 +1323,11 @@ msgstr "" #. Name of a DocType #. Label of the attendance (Select) field in DocType 'Training Event Employee' -#. Label of a Card Break in the HR Setup Workspace -#. Label of a Link in the HR Setup Workspace -#. Label of a Card Break in the Shift & Attendance Workspace -#. Label of a Link in the Shift & Attendance Workspace #. Option for the 'Calculate Payroll Working Days Based On' (Select) field in #. DocType 'Payroll Settings' #: frontend/src/components/BottomTabs.vue:48 #: hrms/hr/doctype/attendance/attendance.json #: hrms/hr/doctype/training_event_employee/training_event_employee.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json #: hrms/overrides/dashboard_overrides.py:10 #: hrms/payroll/doctype/payroll_settings/payroll_settings.json #: hrms/templates/emails/training_event.html:9 @@ -1349,7 +1339,7 @@ msgid "Attendance Calendar" msgstr "" #. Label of a chart in the Shift & Attendance Workspace -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/workspace/shift_&_attendance/shift_&_attendance.json msgid "Attendance Count" msgstr "" @@ -1371,14 +1361,12 @@ msgstr "" #. Label of the attendance_request (Link) field in DocType 'Attendance' #. Name of a DocType -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/attendance/attendance.js:18 #: hrms/hr/doctype/attendance/attendance.json #: hrms/hr/doctype/attendance_request/attendance_request.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Attendance Request" msgstr "" @@ -1442,7 +1430,7 @@ msgstr "" msgid "Attendance marked successfully" msgstr "" -#: hrms/hr/doctype/attendance/attendance.py:407 +#: hrms/hr/doctype/attendance/attendance.py:413 msgid "Attendance marked successfully." msgstr "" @@ -1571,9 +1559,7 @@ msgid "Bank Entries" msgstr "" #. Name of a report -#. Label of a Link in the Payroll Workspace #: hrms/payroll/report/bank_remittance/bank_remittance.json -#: hrms/payroll/workspace/payroll/payroll.json msgid "Bank Remittance" msgstr "" @@ -1608,16 +1594,30 @@ msgstr "" msgid "Benefit Amount" msgstr "" +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item +#: hrms/tax_and_benefits/sidebar/tax_&_benefits/tax_&_benefits.json #: hrms/workspace_sidebar/tax_&_benefits.json msgid "Benefit Application" msgstr "" +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item +#: hrms/tax_and_benefits/sidebar/tax_&_benefits/tax_&_benefits.json #: hrms/workspace_sidebar/tax_&_benefits.json msgid "Benefit Claim" msgstr "" +#. Label of a chart in the Tax & Benefits Workspace +#: hrms/tax_and_benefits/workspace/tax_&_benefits/tax_&_benefits.json +msgid "Benefit Claims" +msgstr "" + +#. Label of a number card in the Tax & Benefits Workspace +#: hrms/tax_and_benefits/workspace/tax_&_benefits/tax_&_benefits.json +msgid "Benefit Claims (This Month)" +msgstr "" + #. Label of the employee_benefit_details_section (Section Break) field in #. DocType 'Employee Benefit Ledger' #: hrms/payroll/doctype/employee_benefit_ledger/employee_benefit_ledger.json @@ -1632,7 +1632,7 @@ msgstr "" msgid "Benefit amount of component {0} should be greater than 0" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:510 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:512 msgid "Benefit amount {0} for Salary Component {1} should not be greater than maximum benefit amount {2} set in {3}" msgstr "" @@ -1640,10 +1640,8 @@ msgstr "" #. Benefit Application' #. Label of the benefit_type_and_amount (Section Break) field in DocType #. 'Employee Benefit Claim' -#. Label of a Card Break in the Tax & Benefits Workspace #: hrms/payroll/doctype/employee_benefit_application/employee_benefit_application.json #: hrms/payroll/doctype/employee_benefit_claim/employee_benefit_claim.json -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json msgid "Benefits" msgstr "" @@ -1705,12 +1703,6 @@ msgstr "" msgid "Boarding Status" msgstr "" -#. Label of the body_section (Section Break) field in DocType 'Appointment -#. Letter' -#: hrms/hr/doctype/appointment_letter/appointment_letter.json -msgid "Body" -msgstr "" - #. Label of the bonus_section (Section Break) field in DocType 'Retention #. Bonus' #: hrms/payroll/doctype/retention_bonus/retention_bonus.json @@ -1753,18 +1745,16 @@ msgid "Bulk Leave Policy Assignment" msgstr "" #. Name of a DocType -#. Label of a Link in the Payroll Workspace #: hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.json #: hrms/payroll/doctype/salary_structure/salary_structure_list.js:3 -#: hrms/payroll/workspace/payroll/payroll.json msgid "Bulk Salary Structure Assignment" msgstr "" -#: hrms/hr/doctype/attendance/attendance.py:401 +#: hrms/hr/doctype/attendance/attendance.py:407 msgid "Bulk attendance marking is already in progress for employee {0}. You can monitor the job status {1}" msgstr "" -#: hrms/hr/doctype/attendance/attendance.py:397 +#: hrms/hr/doctype/attendance/attendance.py:403 msgid "Bulk attendance marking is queued with a background job. It may take a while. You can monitor the job status {0}" msgstr "" @@ -1806,6 +1796,10 @@ msgstr "" msgid "Calculated in days" msgstr "" +#: hrms/hr/doctype/expense_claim/expense_claim.py:710 +msgid "Cancel the Payment Entry made against it, correct the advance account to be of type Receivable, and create a new Payment Entry." +msgstr "" + #: hrms/payroll/doctype/payroll_entry/payroll_entry.py:189 msgid "Cancellation Queued" msgstr "" @@ -1850,11 +1844,11 @@ msgstr "" msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:384 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:387 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:389 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2049,8 +2043,6 @@ msgstr "" msgid "Claimed amount of employee {0} should be greater than 0" msgstr "" -#. Label of a Card Break in the Expenses Workspace -#: hrms/hr/workspace/expenses/expenses.json #: hrms/overrides/dashboard_overrides.py:105 msgid "Claims" msgstr "" @@ -2097,12 +2089,8 @@ msgstr "" #. Name of a DocType #. Label of the compensatory_request (Link) field in DocType 'Leave Allocation' -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Leaves Workspace #: hrms/hr/doctype/compensatory_leave_request/compensatory_leave_request.json #: hrms/hr/doctype/leave_allocation/leave_allocation.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/leaves/leaves.json msgid "Compensatory Leave Request" msgstr "" @@ -2341,7 +2329,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:164 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -2428,24 +2416,17 @@ msgid "Cycles" msgstr "" #. Name of a DocType -#. Label of a Card Break in the Tenure Workspace -#. Label of a Link in the Tenure Workspace #: hrms/hr/doctype/daily_work_summary/daily_work_summary.json #: hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.js:7 -#: hrms/hr/workspace/tenure/tenure.json msgid "Daily Work Summary" msgstr "" #. Label of the daily_work_summary_group (Link) field in DocType 'Daily Work #. Summary' #. Name of a DocType -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Tenure Workspace #: hrms/hr/doctype/daily_work_summary/daily_work_summary.json #: hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.json #: hrms/hr/page/team_updates/team_updates.js:12 -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/tenure/tenure.json msgid "Daily Work Summary Group" msgstr "" @@ -2455,11 +2436,7 @@ msgid "Daily Work Summary Group User" msgstr "" #. Name of a report -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Tenure Workspace #: hrms/hr/report/daily_work_summary_replies/daily_work_summary_replies.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/tenure/tenure.json msgid "Daily Work Summary Replies" msgstr "" @@ -2559,11 +2536,6 @@ msgstr "" msgid "Deduction Arrears" msgstr "" -#. Label of a Card Break in the Payroll Workspace -#: hrms/payroll/workspace/payroll/payroll.json -msgid "Deduction Reports" -msgstr "" - #: hrms/hr/doctype/employee_advance/employee_advance.js:81 msgid "Deduction from Salary" msgstr "" @@ -2629,9 +2601,9 @@ msgstr "" msgid "Department Approver" msgstr "" -#. Label of a chart in the Recruitment Workspace -#: hrms/hr/workspace/recruitment/recruitment.json -msgid "Department Wise Openings" +#. Label of a chart in the HR Setup Workspace +#: hrms/hr_setup/workspace/hr_setup/hr_setup.json +msgid "Department Wise Employee Count" msgstr "" #: hrms/hr/doctype/expense_claim/expense_claim.py:160 @@ -2647,8 +2619,8 @@ msgstr "" msgid "Departure Datetime" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:143 -#: hrms/payroll/doctype/salary_structure/salary_structure.py:147 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:144 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:148 msgid "Depends On Payment Days" msgstr "" @@ -2686,7 +2658,7 @@ msgstr "" msgid "Determine Check-in and Check-out" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:145 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:146 msgid "Disable {0} for the {1} component, to prevent the amount from being deducted twice, as its formula already uses a payment-days-based component." msgstr "" @@ -2923,11 +2895,7 @@ msgid "Employee Advance Balance" msgstr "" #. Name of a report -#. Label of a Link in the Expenses Workspace -#. Label of a Link in the HR Setup Workspace #: hrms/hr/report/employee_advance_summary/employee_advance_summary.json -#: hrms/hr/workspace/expenses/expenses.json -#: hrms/hr/workspace/hr_setup/hr_setup.json msgid "Employee Advance Summary" msgstr "" @@ -2939,29 +2907,41 @@ msgstr "" msgid "Employee Advance {0} has {1} available for return. {2} has already been scheduled for deduction in {3}." msgstr "" +#: hrms/hr/doctype/expense_claim/expense_claim.py:700 +msgid "Employee Advance {0} is in currency {1} and can only be claimed in an Expense Claim of the same currency. This Expense Claim is in {2}." +msgstr "" + +#: hrms/hr/doctype/expense_claim/expense_claim.py:727 +msgid "Employee Advance {0} is linked to account {1}, which is not of type Receivable. Please correct the account type before making a payment against it." +msgstr "" + +#: hrms/hr/doctype/expense_claim/expense_claim.py:718 +msgid "Employee Advance {0} is linked to account {1}, which is not of type Receivable. {2}" +msgstr "" + +#: hrms/hr/doctype/expense_claim/expense_claim.py:745 +msgid "Employee Advance {0}'s payment does not match its Receivable account. This can happen if the account's type was changed after the payment was made. {1}" +msgstr "" + #. Name of a report -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Tenure Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/report/employee_analytics/employee_analytics.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Employee Analytics" msgstr "" #. Name of a DocType -#. Label of a Link in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Employee Attendance Tool" msgstr "" #. Name of a DocType -#. Label of a Link in the Tax & Benefits Workspace #: hrms/payroll/doctype/employee_benefit_application/employee_benefit_application.json -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json msgid "Employee Benefit Application" msgstr "" @@ -2971,9 +2951,7 @@ msgid "Employee Benefit Application Detail" msgstr "" #. Name of a DocType -#. Label of a Link in the Tax & Benefits Workspace #: hrms/payroll/doctype/employee_benefit_claim/employee_benefit_claim.json -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json msgid "Employee Benefit Claim" msgstr "" @@ -2995,12 +2973,10 @@ msgid "Employee Benefits" msgstr "" #. Name of a report -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Tenure Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/report/employee_birthday/employee_birthday.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Employee Birthday" msgstr "" @@ -3010,19 +2986,19 @@ msgid "Employee Boarding Activity" msgstr "" #. Name of a report +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.json +#: hrms/payroll/sidebar/payroll/payroll.json #: hrms/workspace_sidebar/payroll.json msgid "Employee CTC Break-up" msgstr "" #. Name of a DocType -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/employee_checkin/employee_checkin.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Employee Checkin" msgstr "" @@ -3091,18 +3067,23 @@ msgid "Employee Exit Settings" msgstr "" #. Name of a report -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Tenure Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/report/employee_exits/employee_exits.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Employee Exits" msgstr "" +#. Label of a number card in the Tenure Workspace +#: hrms/tenure/workspace/tenure/tenure.json +msgid "Employee Exits (This Year)" +msgstr "" + #. Name of a DocType +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/employee_feedback_criteria/employee_feedback_criteria.json +#: hrms/performance/sidebar/performance/performance.json #: hrms/workspace_sidebar/performance.json msgid "Employee Feedback Criteria" msgstr "" @@ -3123,7 +3104,7 @@ msgstr "" #. Template' #. Label of the employee_grade (Link) field in DocType 'Leave Control Panel' #. Label of the grade (Link) field in DocType 'Shift Assignment Tool' -#. Label of a Link in the HR Setup Workspace +#. Label of a Sidebar Item #. Label of the grade (Link) field in DocType 'Bulk Salary Structure #. Assignment' #. Label of a Workspace Sidebar Item @@ -3135,17 +3116,17 @@ msgstr "" #: hrms/hr/doctype/employee_separation_template/employee_separation_template.json #: hrms/hr/doctype/leave_control_panel/leave_control_panel.json #: hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json -#: hrms/hr/workspace/hr_setup/hr_setup.json +#: hrms/hr_setup/sidebar/hr_setup/hr_setup.json #: hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.json #: hrms/workspace_sidebar/hr_setup.json msgid "Employee Grade" msgstr "" #. Name of a DocType -#. Label of a Link in the Tenure Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/employee_grievance/employee_grievance.json -#: hrms/hr/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Employee Grievance" msgstr "" @@ -3154,15 +3135,15 @@ msgstr "" msgid "Employee Health Insurance" msgstr "" +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Employee Hours Utilization" msgstr "" #. Name of a report -#. Label of a Link in the Shift & Attendance Workspace #: hrms/hr/report/employee_hours_utilization_based_on_timesheet/employee_hours_utilization_based_on_timesheet.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json msgid "Employee Hours Utilization Based On Timesheet" msgstr "" @@ -3172,9 +3153,7 @@ msgid "Employee Image" msgstr "" #. Name of a DocType -#. Label of a Link in the Payroll Workspace #: hrms/payroll/doctype/employee_incentive/employee_incentive.json -#: hrms/payroll/workspace/payroll/payroll.json msgid "Employee Incentive" msgstr "" @@ -3184,30 +3163,20 @@ msgid "Employee Info" msgstr "" #. Name of a report -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Tenure Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/report/employee_information/employee_information.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Employee Information" msgstr "" #. Name of a report -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Leaves Workspace #: hrms/hr/report/employee_leave_balance/employee_leave_balance.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/leaves/leaves.json msgid "Employee Leave Balance" msgstr "" #. Name of a report -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Leaves Workspace #: hrms/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/leaves/leaves.json msgid "Employee Leave Balance Summary" msgstr "" @@ -3221,20 +3190,18 @@ msgid "Employee Naming By" msgstr "" #. Name of a DocType -#. Label of a Link in the Tenure Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/employee_onboarding/employee_onboarding.json -#: hrms/hr/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Employee Onboarding" msgstr "" #. Label of the employee_onboarding_template (Link) field in DocType 'Employee #. Onboarding' #. Name of a DocType -#. Label of a Link in the Tenure Workspace #: hrms/hr/doctype/employee_onboarding/employee_onboarding.json #: hrms/hr/doctype/employee_onboarding_template/employee_onboarding_template.json -#: hrms/hr/workspace/tenure/tenure.json msgid "Employee Onboarding Template" msgstr "" @@ -3248,15 +3215,19 @@ msgid "Employee Other Income" msgstr "" #. Name of a DocType +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/employee_performance_feedback/employee_performance_feedback.json +#: hrms/performance/sidebar/performance/performance.json #: hrms/workspace_sidebar/performance.json msgid "Employee Performance Feedback" msgstr "" #. Name of a DocType +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/employee_promotion/employee_promotion.json +#: hrms/performance/sidebar/performance/performance.json #: hrms/workspace_sidebar/performance.json msgid "Employee Promotion" msgstr "" @@ -3278,12 +3249,12 @@ msgstr "" #. Name of a DocType #. Label of the employee_referral (Link) field in DocType 'Job Applicant' -#. Label of a Link in the Recruitment Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/employee_referral/employee_referral.json #: hrms/hr/doctype/job_applicant/job_applicant.json #: hrms/hr/doctype/job_requisition/job_requisition.js:18 -#: hrms/hr/workspace/recruitment/recruitment.json hrms/setup.py:461 +#: hrms/recruitment/sidebar/recruitment/recruitment.json hrms/setup.py:461 #: hrms/workspace_sidebar/recruitment.json msgid "Employee Referral" msgstr "" @@ -3316,9 +3287,10 @@ msgid "Employee Retained" msgstr "" #. Name of a DocType +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/employee_separation/employee_separation.json -#: hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Employee Separation" msgstr "" @@ -3342,10 +3314,10 @@ msgid "Employee Skill" msgstr "" #. Name of a DocType -#. Label of a Link in the Tenure Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/employee_skill_map/employee_skill_map.json -#: hrms/hr/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Employee Skill Map" msgstr "" @@ -3363,16 +3335,12 @@ msgid "Employee Status" msgstr "" #. Name of a DocType -#. Label of a Link in the Tax & Benefits Workspace #: hrms/payroll/doctype/employee_tax_exemption_category/employee_tax_exemption_category.json -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json msgid "Employee Tax Exemption Category" msgstr "" #. Name of a DocType -#. Label of a Link in the Tax & Benefits Workspace #: hrms/payroll/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.json -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json msgid "Employee Tax Exemption Declaration" msgstr "" @@ -3382,9 +3350,7 @@ msgid "Employee Tax Exemption Declaration Category" msgstr "" #. Name of a DocType -#. Label of a Link in the Tax & Benefits Workspace #: hrms/payroll/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.json -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json msgid "Employee Tax Exemption Proof Submission" msgstr "" @@ -3394,9 +3360,7 @@ msgid "Employee Tax Exemption Proof Submission Detail" msgstr "" #. Name of a DocType -#. Label of a Link in the Tax & Benefits Workspace #: hrms/payroll/doctype/employee_tax_exemption_sub_category/employee_tax_exemption_sub_category.json -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json msgid "Employee Tax Exemption Sub Category" msgstr "" @@ -3505,7 +3469,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:742 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:745 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3523,9 +3487,19 @@ msgstr "" msgid "Employees HTML" msgstr "" -#. Label of a Link in the HR Setup Workspace +#. Label of a number card in the HR Setup Workspace +#: hrms/hr_setup/workspace/hr_setup/hr_setup.json +msgid "Employees Joining (This Quarter)" +msgstr "" + +#. Label of a number card in the HR Setup Workspace +#: hrms/hr_setup/workspace/hr_setup/hr_setup.json +msgid "Employees Relieving (This Quarter)" +msgstr "" + +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item -#: hrms/hr/workspace/hr_setup/hr_setup.json hrms/workspace_sidebar/leaves.json +#: hrms/leaves/sidebar/leaves/leaves.json hrms/workspace_sidebar/leaves.json msgid "Employees Working on a Holiday" msgstr "" @@ -3539,16 +3513,6 @@ msgstr "" msgid "Employees on Half Day HTML" msgstr "" -#. Label of a number card in the Leaves Workspace -#: hrms/hr/workspace/leaves/leaves.json -msgid "Employees on leave this month" -msgstr "" - -#. Label of a number card in the Leaves Workspace -#: hrms/hr/workspace/leaves/leaves.json -msgid "Employees on leave today" -msgstr "" - #: hrms/hr/doctype/hr_settings/hr_settings.py:125 msgid "Employees will miss holiday reminders from {} until {}.
Do you want to proceed with this change?" msgstr "" @@ -3562,11 +3526,7 @@ msgid "Employees without Goals: {0}" msgstr "" #. Name of a report -#. Label of a Link in the Leaves Workspace -#. Label of a Link in the Shift & Attendance Workspace #: hrms/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json -#: hrms/hr/workspace/leaves/leaves.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json msgid "Employees working on a holiday" msgstr "" @@ -3575,8 +3535,11 @@ msgstr "" msgid "Employer Contribution" msgstr "" +#. Label of the employer_contributions_section (Section Break) field in DocType +#. 'Salary Slip' #. Label of the employer_contributions (Table) field in DocType 'Salary #. Structure' +#: hrms/payroll/doctype/salary_slip/salary_slip.json #: hrms/payroll/doctype/salary_structure/salary_structure.json msgid "Employer Contributions" msgstr "" @@ -3730,8 +3693,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1414 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1426 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:459 msgid "Error in formula or condition" msgstr "" @@ -3743,7 +3706,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/utils.py:160 +#: hrms/payroll/utils.py:169 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -3855,23 +3818,22 @@ msgstr "" msgid "Exempted from Income Tax" msgstr "" -#. Label of a Card Break in the Tax & Benefits Workspace -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json -msgid "Exemption" -msgstr "" - #. Label of the exemption_category (Link) field in DocType 'Employee Tax #. Exemption Declaration Category' #. Label of the exemption_category (Read Only) field in DocType 'Employee Tax #. Exemption Proof Submission Detail' +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/payroll/doctype/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.json #: hrms/payroll/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.json +#: hrms/tax_and_benefits/sidebar/tax_&_benefits/tax_&_benefits.json #: hrms/workspace_sidebar/tax_&_benefits.json msgid "Exemption Category" msgstr "" +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item +#: hrms/tax_and_benefits/sidebar/tax_&_benefits/tax_&_benefits.json #: hrms/workspace_sidebar/tax_&_benefits.json msgid "Exemption Declaration" msgstr "" @@ -3891,7 +3853,9 @@ msgstr "" msgid "Exemption Sub Category" msgstr "" +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item +#: hrms/tax_and_benefits/sidebar/tax_&_benefits/tax_&_benefits.json #: hrms/workspace_sidebar/tax_&_benefits.json msgid "Exemption Submission Proof" msgstr "" @@ -3968,7 +3932,7 @@ msgid "Exit Questionnaire Web Form" msgstr "" #. Label of a quick_list in the Tenure Workspace -#: hrms/hr/workspace/tenure/tenure.json +#: hrms/tenure/workspace/tenure/tenure.json msgid "Exits (This Month)" msgstr "" @@ -4040,15 +4004,15 @@ msgstr "" msgid "Expense Claim Summary" msgstr "" +#. Label of a Sidebar Item #. Label of the expense_type (Link) field in DocType 'Expense Claim Detail' #. Name of a DocType #. Label of the expense_type (Data) field in DocType 'Expense Claim Type' -#. Label of a Link in the Expenses Workspace #. Label of a Workspace Sidebar Item -#: hrms/hr/doctype/expense_claim/expense_claim.py:670 +#: hrms/expenses/sidebar/expenses/expenses.json +#: hrms/hr/doctype/expense_claim/expense_claim.py:677 #: hrms/hr/doctype/expense_claim_detail/expense_claim_detail.json #: hrms/hr/doctype/expense_claim_type/expense_claim_type.json -#: hrms/hr/workspace/expenses/expenses.json #: hrms/workspace_sidebar/expenses.json msgid "Expense Claim Type" msgstr "" @@ -4063,10 +4027,15 @@ msgstr "" #. Label of a chart in the Expenses Workspace #: frontend/src/views/expense_claim/Dashboard.vue:2 -#: hrms/hr/workspace/expenses/expenses.json +#: hrms/expenses/workspace/expenses/expenses.json msgid "Expense Claims" msgstr "" +#. Label of a number card in the Expenses Workspace +#: hrms/expenses/workspace/expenses/expenses.json +msgid "Expense Claims (This Month)" +msgstr "" + #. Label of the expense_date (Date) field in DocType 'Expense Claim Detail' #: hrms/hr/doctype/expense_claim_detail/expense_claim_detail.json msgid "Expense Date" @@ -4355,11 +4324,6 @@ msgstr "" msgid "Fixed Hourly Rate" msgstr "" -#. Label of a Card Break in the Expenses Workspace -#: hrms/hr/workspace/expenses/expenses.json -msgid "Fleet Management" -msgstr "" - #. Label of the flexible_benefit (Check) field in DocType 'Employee Benefit #. Ledger' #: hrms/payroll/doctype/employee_benefit_ledger/employee_benefit_ledger.json @@ -4473,7 +4437,7 @@ msgstr "" msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:129 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4481,7 +4445,7 @@ msgstr "" msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:121 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -4667,6 +4631,11 @@ msgstr "" msgid "Goal updated successfully" msgstr "" +#. Label of a number card in the Performance Workspace +#: hrms/performance/workspace/performance/performance.json +msgid "Goals In Progress" +msgstr "" + #: hrms/hr/doctype/goal/goal_list.js:129 msgid "Goals updated successfully" msgstr "" @@ -4709,11 +4678,6 @@ msgstr "" msgid "Gratuity Rule Slab" msgstr "" -#. Label of a Card Break in the Tenure Workspace -#: hrms/hr/workspace/tenure/tenure.json -msgid "Grievance" -msgstr "" - #. Label of the grievance_against (Dynamic Link) field in DocType 'Employee #. Grievance' #: hrms/hr/doctype/employee_grievance/employee_grievance.json @@ -4734,11 +4698,11 @@ msgstr "" #. Label of the grievance_type (Link) field in DocType 'Employee Grievance' #. Name of a DocType -#. Label of a Link in the Tenure Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/employee_grievance/employee_grievance.json #: hrms/hr/doctype/grievance_type/grievance_type.json -#: hrms/hr/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Grievance Type" msgstr "" @@ -4788,19 +4752,19 @@ msgid "HR & Payroll Settings" msgstr "" #. Name of a DocType -#. Label of a Link in the HR Setup Workspace #: hrms/hr/doctype/hr_settings/hr_settings.json #: hrms/hr/doctype/leave_application/leave_application.py:214 #: hrms/hr/report/employee_hours_utilization_based_on_timesheet/employee_hours_utilization_based_on_timesheet.py:37 #: hrms/hr/report/project_profitability/project_profitability.py:103 -#: hrms/hr/workspace/hr_setup/hr_setup.json msgid "HR Settings" msgstr "" #. Label of a Desktop Icon +#. Title of a Sidebar #. Name of a Workspace #. Title of a Workspace Sidebar -#: hrms/desktop_icon/hr_setup.json hrms/hr/workspace/hr_setup/hr_setup.json +#: hrms/desktop_icon/hr_setup.json hrms/hr_setup/sidebar/hr_setup/hr_setup.json +#: hrms/hr_setup/workspace/hr_setup/hr_setup.json #: hrms/workspace_sidebar/hr_setup.json msgid "HR Setup" msgstr "" @@ -4891,6 +4855,10 @@ msgstr "" msgid "Health Insurance Provider" msgstr "" +#: hrms/hr/notification/training_feedback/training_feedback.html:1 +msgid "Hello" +msgstr "" + #: hrms/controllers/employee_reminders.py:74 msgid "Hey {}! This email is to remind you about the upcoming holidays." msgstr "" @@ -4903,7 +4871,9 @@ msgstr "" msgid "Hiring Count" msgstr "" +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Hiring Pipeline" msgstr "" @@ -4914,10 +4884,16 @@ msgstr "" msgid "Hiring Settings" msgstr "" +#. Label of a chart in the Tenure Workspace +#: hrms/tenure/workspace/tenure/tenure.json +msgid "Hiring vs Attrition Count" +msgstr "" + #. Name of a DocType +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/holiday_list_assignment/holiday_list_assignment.json -#: hrms/workspace_sidebar/leaves.json +#: hrms/leaves/sidebar/leaves/leaves.json hrms/workspace_sidebar/leaves.json msgid "Holiday List Assignment" msgstr "" @@ -4943,7 +4919,7 @@ msgid "Holiday List for Optional Leave" msgstr "" #. Label of a number card in the Leaves Workspace -#: hrms/hr/workspace/leaves/leaves.json +#: hrms/leaves/workspace/leaves/leaves.json msgid "Holidays in this month" msgstr "" @@ -5215,12 +5191,10 @@ msgid "Income Tax Component" msgstr "" #. Name of a report -#. Label of a Link in the Payroll Workspace -#. Label of a Link in the Tax & Benefits Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/payroll/report/income_tax_computation/income_tax_computation.json -#: hrms/payroll/workspace/payroll/payroll.json -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json +#: hrms/tax_and_benefits/sidebar/tax_&_benefits/tax_&_benefits.json #: hrms/workspace_sidebar/tax_&_benefits.json msgid "Income Tax Computation" msgstr "" @@ -5232,12 +5206,11 @@ msgid "Income Tax Deducted Till Date" msgstr "" #. Name of a report -#. Label of a Link in the Payroll Workspace -#. Label of a Link in the Tax & Benefits Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/payroll/report/income_tax_deductions/income_tax_deductions.json -#: hrms/payroll/workspace/payroll/payroll.json -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json +#: hrms/payroll/sidebar/payroll/payroll.json +#: hrms/tax_and_benefits/sidebar/tax_&_benefits/tax_&_benefits.json #: hrms/workspace_sidebar/payroll.json #: hrms/workspace_sidebar/tax_&_benefits.json msgid "Income Tax Deductions" @@ -5248,16 +5221,14 @@ msgstr "" #. Name of a DocType #. Label of the income_tax_slab (Link) field in DocType 'Salary Structure #. Assignment' -#. Label of a Link in the Payroll Workspace -#. Label of a Link in the Tax & Benefits Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.json #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.json #: hrms/payroll/doctype/salary_structure/salary_structure.js:148 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json #: hrms/payroll/report/income_tax_computation/income_tax_computation.py:639 -#: hrms/payroll/workspace/payroll/payroll.json -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json +#: hrms/tax_and_benefits/sidebar/tax_&_benefits/tax_&_benefits.json #: hrms/workspace_sidebar/tax_&_benefits.json msgid "Income Tax Slab" msgstr "" @@ -5267,15 +5238,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:149 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1971 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1983 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1971 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5283,7 +5254,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1967 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1979 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5352,12 +5323,12 @@ msgstr "" #. Name of a DocType #. Label of the interview (Link) field in DocType 'Interview Feedback' -#. Label of a Link in the Recruitment Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/interview/interview.json #: hrms/hr/doctype/interview_feedback/interview_feedback.json #: hrms/hr/doctype/job_applicant/job_applicant_dashboard.html:7 -#: hrms/hr/workspace/recruitment/recruitment.json +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Interview" msgstr "" @@ -5374,10 +5345,8 @@ msgid "Interview Details" msgstr "" #. Name of a DocType -#. Label of a Link in the Recruitment Workspace #: hrms/hr/doctype/interview_feedback/interview_feedback.json #: hrms/hr/doctype/interview_feedback/interview_feedback.py:61 -#: hrms/hr/workspace/recruitment/recruitment.json msgid "Interview Feedback" msgstr "" @@ -5436,14 +5405,14 @@ msgstr "" #. Label of the interview_type (Link) field in DocType 'Interview' #. Label of the interview_type (Link) field in DocType 'Interview Feedback' #. Name of a DocType -#. Label of a Link in the Recruitment Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/interview/interview.json #: hrms/hr/doctype/interview_feedback/interview_feedback.json #: hrms/hr/doctype/interview_type/interview_type.json #: hrms/hr/doctype/job_applicant/job_applicant.js:135 #: hrms/hr/doctype/job_applicant/job_applicant_dashboard.html:8 -#: hrms/hr/workspace/recruitment/recruitment.json +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Interview Type" msgstr "" @@ -5453,11 +5422,11 @@ msgstr "" msgid "Interview Type Name" msgstr "" -#: hrms/hr/doctype/job_applicant/job_applicant.py:176 +#: hrms/hr/doctype/job_applicant/job_applicant.py:184 msgid "Interview Type {0} is only applicable for Designation {1}" msgstr "" -#: hrms/hr/doctype/job_applicant/job_applicant.py:140 +#: hrms/hr/doctype/job_applicant/job_applicant.py:148 msgid "Interview Type {0} is only applicable for the Designation {1}" msgstr "" @@ -5497,13 +5466,8 @@ msgstr "" msgid "Interviewers" msgstr "" -#. Label of a Card Break in the Recruitment Workspace -#: hrms/hr/workspace/recruitment/recruitment.json -msgid "Interviews" -msgstr "" - #. Label of a quick_list in the Recruitment Workspace -#: hrms/hr/workspace/recruitment/recruitment.json +#: hrms/recruitment/workspace/recruitment/recruitment.json msgid "Interviews (This Week)" msgstr "" @@ -5521,7 +5485,7 @@ msgstr "" msgid "Invalid Arrear Component" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:526 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:528 msgid "Invalid Benefit Amounts" msgstr "" @@ -5529,7 +5493,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2674 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5537,7 +5501,7 @@ msgstr "" msgid "Invalid Leave Ledger Entry" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:322 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:324 msgid "Invalid Payroll Payable Account. The account currency must be {0} or {1}" msgstr "" @@ -5550,7 +5514,7 @@ msgstr "" msgid "Invalid employee filter: {0}" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:891 +#: hrms/hr/doctype/expense_claim/expense_claim.py:964 msgid "Invalid parameters provided. Please pass the required arguments." msgstr "" @@ -5684,7 +5648,7 @@ msgstr "" #. Label of the job_applicant (Link) field in DocType 'Interview Feedback' #. Name of a DocType #. Label of the job_applicant (Link) field in DocType 'Job Offer' -#. Label of a Link in the Recruitment Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/appointment_letter/appointment_letter.json #: hrms/hr/doctype/employee_onboarding/employee_onboarding.json @@ -5693,11 +5657,16 @@ msgstr "" #: hrms/hr/doctype/job_applicant/job_applicant.json #: hrms/hr/doctype/job_offer/job_offer.json #: hrms/hr/report/recruitment_analytics/recruitment_analytics.py:38 -#: hrms/hr/workspace/recruitment/recruitment.json hrms/setup.py:251 +#: hrms/recruitment/sidebar/recruitment/recruitment.json hrms/setup.py:251 #: hrms/workspace_sidebar/recruitment.json msgid "Job Applicant" msgstr "" +#. Label of a chart in the Recruitment Workspace +#: hrms/recruitment/workspace/recruitment/recruitment.json +msgid "Job Applicant Pipeline" +msgstr "" + #. Name of a DocType #: hrms/hr/doctype/job_applicant_source/job_applicant_source.json msgid "Job Applicant Source" @@ -5725,12 +5694,12 @@ msgstr "" #. Label of the job_offer (Link) field in DocType 'Employee Onboarding' #. Name of a DocType -#. Label of a Link in the Recruitment Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/employee_onboarding/employee_onboarding.json #: hrms/hr/doctype/job_offer/job_offer.json #: hrms/hr/report/recruitment_analytics/recruitment_analytics.py:52 -#: hrms/hr/workspace/recruitment/recruitment.json +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Job Offer" msgstr "" @@ -5742,9 +5711,11 @@ msgstr "" #. Label of the job_offer_term_template (Link) field in DocType 'Job Offer' #. Name of a DocType +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/job_offer/job_offer.json #: hrms/hr/doctype/job_offer_term_template/job_offer_term_template.json +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Job Offer Term Template" msgstr "" @@ -5762,11 +5733,16 @@ msgstr "" msgid "Job Offer: {0} is already for Job Applicant: {1}" msgstr "" +#. Label of a number card in the Recruitment Workspace +#: hrms/recruitment/workspace/recruitment/recruitment.json +msgid "Job Offers (This Month)" +msgstr "" + #. Label of the job_opening (Link) field in DocType 'Interview' #. Label of the job_title (Link) field in DocType 'Job Applicant' #. Name of a DocType #. Label of a field in the job-application Web Form -#. Label of a Link in the Recruitment Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/interview/interview.json #: hrms/hr/doctype/job_applicant/job_applicant.json @@ -5774,7 +5750,7 @@ msgstr "" #: hrms/hr/doctype/job_requisition/job_requisition.js:54 #: hrms/hr/report/recruitment_analytics/recruitment_analytics.py:31 #: hrms/hr/web_form/job_application/job_application.json -#: hrms/hr/workspace/recruitment/recruitment.json +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Job Opening" msgstr "" @@ -5785,13 +5761,17 @@ msgstr "" #. Label of the job_opening_template (Link) field in DocType 'Job Opening' #. Name of a DocType +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/job_opening/job_opening.json #: hrms/hr/doctype/job_opening_template/job_opening_template.json +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Job Opening Template" msgstr "" +#. Label of a number card in the Recruitment Workspace +#: hrms/recruitment/workspace/recruitment/recruitment.json #: hrms/www/jobs/index.html:2 hrms/www/jobs/index.html:5 msgid "Job Openings" msgstr "" @@ -5800,18 +5780,20 @@ msgstr "" msgid "Job Openings for the designation {0} are already open or the hiring is complete as per the Staffing Plan {1}" msgstr "" +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Job Portal" msgstr "" #. Label of the job_requisition (Link) field in DocType 'Job Opening' #. Name of a DocType -#. Label of a Link in the Recruitment Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/job_opening/job_opening.json #: hrms/hr/doctype/job_requisition/job_requisition.json -#: hrms/hr/workspace/recruitment/recruitment.json +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Job Requisition" msgstr "" @@ -5826,11 +5808,6 @@ msgstr "" msgid "Job profile, qualifications required etc." msgstr "" -#. Label of a Card Break in the Recruitment Workspace -#: hrms/hr/workspace/recruitment/recruitment.json -msgid "Jobs" -msgstr "" - #. Option for the 'Dates Based On' (Select) field in DocType 'Leave Control #. Panel' #. Option for the 'Assignment based on' (Select) field in DocType 'Leave Policy @@ -5855,11 +5832,14 @@ msgstr "" #. Goal' #. Label of the kra (Link) field in DocType 'Goal' #. Name of a DocType +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/appraisal_kra/appraisal_kra.json #: hrms/hr/doctype/appraisal_template_goal/appraisal_template_goal.json #: hrms/hr/doctype/goal/goal.json hrms/hr/doctype/goal/goal_tree.js:134 -#: hrms/hr/doctype/kra/kra.json hrms/workspace_sidebar/performance.json +#: hrms/hr/doctype/kra/kra.json +#: hrms/performance/sidebar/performance/performance.json +#: hrms/workspace_sidebar/performance.json msgid "KRA" msgstr "" @@ -5901,7 +5881,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2659 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2671 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -5948,6 +5928,11 @@ msgstr "" msgid "Late Entry & Early Exit Settings for Auto Attendance" msgstr "" +#. Label of a number card in the Shift & Attendance Workspace +#: hrms/shift_and_attendance/workspace/shift_&_attendance/shift_&_attendance.json +msgid "Late Entry (This Month)" +msgstr "" + #: hrms/hr/report/shift_attendance/shift_attendance.py:88 msgid "Late Entry By" msgstr "" @@ -5986,12 +5971,12 @@ msgstr "" #. Request' #. Name of a DocType #. Label of the leave_allocation (Link) field in DocType 'Leave Encashment' -#. Label of a Link in the Leaves Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/compensatory_leave_request/compensatory_leave_request.json #: hrms/hr/doctype/leave_allocation/leave_allocation.json #: hrms/hr/doctype/leave_encashment/leave_encashment.json -#: hrms/hr/workspace/leaves/leaves.json hrms/workspace_sidebar/leaves.json +#: hrms/leaves/sidebar/leaves/leaves.json hrms/workspace_sidebar/leaves.json msgid "Leave Allocation" msgstr "" @@ -6007,13 +5992,11 @@ msgstr "" #. Label of the leave_application (Link) field in DocType 'Attendance' #. Name of a DocType -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Leaves Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/attendance/attendance.json #: hrms/hr/doctype/leave_application/leave_application.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/leaves/leaves.json hrms/workspace_sidebar/leaves.json +#: hrms/leaves/sidebar/leaves/leaves.json hrms/workspace_sidebar/leaves.json msgid "Leave Application" msgstr "" @@ -6021,6 +6004,11 @@ msgstr "" msgid "Leave Application period cannot be across two non-consecutive leave allocations {0} and {1}." msgstr "" +#. Label of a chart in the Leaves Workspace +#: hrms/leaves/workspace/leaves/leaves.json +msgid "Leave Applications by Type" +msgstr "" + #: hrms/setup.py:493 hrms/setup.py:495 hrms/setup.py:555 msgid "Leave Approval Notification" msgstr "" @@ -6060,10 +6048,11 @@ msgid "Leave Approver is mandatory" msgstr "" #. Label of the leave_balance (Float) field in DocType 'Leave Encashment' +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: frontend/src/components/LeaveBalance.vue:4 #: hrms/hr/doctype/leave_encashment/leave_encashment.json -#: hrms/workspace_sidebar/leaves.json +#: hrms/leaves/sidebar/leaves/leaves.json hrms/workspace_sidebar/leaves.json msgid "Leave Balance" msgstr "" @@ -6072,16 +6061,17 @@ msgstr "" msgid "Leave Balance Before Application" msgstr "" +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item -#: hrms/workspace_sidebar/leaves.json +#: hrms/leaves/sidebar/leaves/leaves.json hrms/workspace_sidebar/leaves.json msgid "Leave Balance Summary" msgstr "" #. Name of a DocType -#. Label of a Link in the Leaves Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/leave_block_list/leave_block_list.json -#: hrms/hr/workspace/leaves/leaves.json hrms/setup.py:182 +#: hrms/leaves/sidebar/leaves/leaves.json hrms/setup.py:182 #: hrms/workspace_sidebar/leaves.json msgid "Leave Block List" msgstr "" @@ -6119,10 +6109,10 @@ msgid "Leave Blocked" msgstr "" #. Name of a DocType -#. Label of a Link in the Leaves Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/leave_control_panel/leave_control_panel.json -#: hrms/hr/workspace/leaves/leaves.json hrms/workspace_sidebar/leaves.json +#: hrms/leaves/sidebar/leaves/leaves.json hrms/workspace_sidebar/leaves.json msgid "Leave Control Panel" msgstr "" @@ -6132,10 +6122,10 @@ msgid "Leave Details" msgstr "" #. Name of a DocType -#. Label of a Link in the Leaves Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/leave_encashment/leave_encashment.json -#: hrms/hr/workspace/leaves/leaves.json hrms/workspace_sidebar/leaves.json +#: hrms/leaves/sidebar/leaves/leaves.json hrms/workspace_sidebar/leaves.json msgid "Leave Encashment" msgstr "" @@ -6176,14 +6166,14 @@ msgstr "" #. Option for the 'Assignment based on' (Select) field in DocType 'Leave Policy #. Assignment' #. Label of the leave_period (Link) field in DocType 'Leave Policy Assignment' -#. Label of a Link in the Leaves Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/leave_allocation/leave_allocation.json #: hrms/hr/doctype/leave_control_panel/leave_control_panel.json #: hrms/hr/doctype/leave_encashment/leave_encashment.json #: hrms/hr/doctype/leave_period/leave_period.json #: hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.json -#: hrms/hr/workspace/leaves/leaves.json hrms/workspace_sidebar/leaves.json +#: hrms/leaves/sidebar/leaves/leaves.json hrms/workspace_sidebar/leaves.json msgid "Leave Period" msgstr "" @@ -6191,13 +6181,13 @@ msgstr "" #. Label of the leave_policy (Link) field in DocType 'Leave Control Panel' #. Name of a DocType #. Label of the leave_policy (Link) field in DocType 'Leave Policy Assignment' -#. Label of a Link in the Leaves Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/leave_allocation/leave_allocation.json #: hrms/hr/doctype/leave_control_panel/leave_control_panel.json #: hrms/hr/doctype/leave_policy/leave_policy.json #: hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.json -#: hrms/hr/workspace/leaves/leaves.json hrms/public/js/erpnext/employee.js:25 +#: hrms/leaves/sidebar/leaves/leaves.json hrms/public/js/erpnext/employee.js:25 #: hrms/workspace_sidebar/leaves.json msgid "Leave Policy" msgstr "" @@ -6207,12 +6197,12 @@ msgstr "" #. Label of the leave_policy_assignment (Link) field in DocType 'Leave #. Allocation' #. Name of a DocType -#. Label of a Link in the Leaves Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/earned_leave_schedule/earned_leave_schedule.json #: hrms/hr/doctype/leave_allocation/leave_allocation.json #: hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.json -#: hrms/hr/workspace/leaves/leaves.json hrms/workspace_sidebar/leaves.json +#: hrms/leaves/sidebar/leaves/leaves.json hrms/workspace_sidebar/leaves.json msgid "Leave Policy Assignment" msgstr "" @@ -6261,7 +6251,7 @@ msgstr "" #. Label of the leave_type (Link) field in DocType 'Leave Ledger Entry' #. Label of the leave_type (Link) field in DocType 'Leave Policy Detail' #. Name of a DocType -#. Label of a Link in the Leaves Workspace +#. Label of a Sidebar Item #. Label of the leave_type (Link) field in DocType 'Salary Slip Leave' #. Label of a Workspace Sidebar Item #: frontend/src/views/leave/List.vue:41 @@ -6281,7 +6271,7 @@ msgstr "" #: hrms/hr/report/employee_leave_balance/employee_leave_balance.py:34 #: hrms/hr/report/leave_ledger/leave_ledger.js:22 #: hrms/hr/report/leave_ledger/leave_ledger.py:65 -#: hrms/hr/workspace/leaves/leaves.json +#: hrms/leaves/sidebar/leaves/leaves.json #: hrms/payroll/doctype/salary_slip_leave/salary_slip_leave.json #: hrms/workspace_sidebar/leaves.json msgid "Leave Type" @@ -6323,7 +6313,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:607 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:610 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6380,7 +6370,7 @@ msgstr "" #. Label of a Desktop Icon #. Label of the leaves_tab (Tab Break) field in DocType 'HR Settings' #. Label of the leaves (Float) field in DocType 'Leave Ledger Entry' -#. Label of a Card Break in the HR Setup Workspace +#. Title of a Sidebar #. Name of a Workspace #. Label of the leave_details_section (Tab Break) field in DocType 'Salary #. Slip' @@ -6391,8 +6381,8 @@ msgstr "" #: hrms/hr/doctype/leave_policy/leave_policy_dashboard.py:8 #: hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment_dashboard.py:8 #: hrms/hr/report/leave_ledger/leave_ledger.py:59 -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/leaves/leaves.json +#: hrms/leaves/sidebar/leaves/leaves.json +#: hrms/leaves/workspace/leaves/leaves.json #: hrms/payroll/doctype/salary_slip/salary_slip.json #: hrms/workspace_sidebar/leaves.json msgid "Leaves" @@ -6814,11 +6804,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:155 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:237 msgid "Missing Opening Entries" msgstr "" @@ -6830,7 +6820,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1962 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1974 msgid "Missing Tax Slab" msgstr "" @@ -6858,12 +6848,10 @@ msgid "Month To Date(Company Currency)" msgstr "" #. Name of a report -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Monthly Attendance Sheet" msgstr "" @@ -6905,8 +6893,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1400 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:388 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1412 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:445 msgid "Name error" msgstr "" @@ -6934,7 +6922,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:287 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:289 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6942,7 +6930,7 @@ msgstr "" msgid "Net Salary Amount" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:127 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:128 msgid "Net pay cannot be negative" msgstr "" @@ -6964,10 +6952,15 @@ msgid "New Feedback" msgstr "" #. Label of a quick_list in the Tenure Workspace -#: hrms/hr/workspace/tenure/tenure.json +#: hrms/tenure/workspace/tenure/tenure.json msgid "New Hires (This Month)" msgstr "" +#. Label of a number card in the Tenure Workspace +#: hrms/tenure/workspace/tenure/tenure.json +msgid "New Hires (This Year)" +msgstr "" + #. Label of the new_leaves_allocated (Float) field in DocType 'Leave #. Allocation' #: hrms/hr/doctype/leave_allocation/leave_allocation.json @@ -6993,7 +6986,7 @@ msgstr "" msgid "No Bank/Cash Account found for currency {0}. Please create one under company {1}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:246 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:248 msgid "No Employee Found" msgstr "" @@ -7041,7 +7034,7 @@ msgstr "" msgid "No Salary Structure assigned to Employee {0} on the given date {1}" msgstr "" -#: hrms/payroll/doctype/salary_component/salary_component.js:115 +#: hrms/payroll/doctype/salary_component/salary_component.js:121 msgid "No Salary Structures" msgstr "" @@ -7061,7 +7054,7 @@ msgstr "" msgid "No active employee found associated with the email ID {0}. Try logging in with your employee email ID or contact your HR manager for access." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:520 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7246,7 +7239,7 @@ msgstr "" msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2271 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2283 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7287,6 +7280,16 @@ msgstr "" msgid "Number Of Positions" msgstr "" +#. Label of a number card in the Leaves Workspace +#: hrms/leaves/workspace/leaves/leaves.json +msgid "Number of Employees on Leave (This Month)" +msgstr "" + +#. Label of a number card in the Leaves Workspace +#: hrms/leaves/workspace/leaves/leaves.json +msgid "Number of Employees on Leave (Today)" +msgstr "" + #. Label of the number_of_leaves (Float) field in DocType 'Earned Leave #. Schedule' #: hrms/hr/doctype/earned_leave_schedule/earned_leave_schedule.json @@ -7374,11 +7377,6 @@ msgstr "" msgid "On Leave" msgstr "" -#. Label of a Card Break in the Tenure Workspace -#: hrms/hr/workspace/tenure/tenure.json -msgid "Onboarding" -msgstr "" - #. Label of the table_for_activity (Section Break) field in DocType 'Employee #. Onboarding' #: hrms/hr/doctype/employee_onboarding/employee_onboarding.json @@ -7391,6 +7389,11 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" +#. Label of a number card in the Performance Workspace +#: hrms/performance/workspace/performance/performance.json +msgid "Ongoing Appraisal Cycles" +msgstr "" + #: hrms/hr/doctype/shift_request/shift_request.py:121 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7470,8 +7473,10 @@ msgstr "" msgid "Optional Leaves are holidays that Employees can choose to avail from a list of holidays published by the company." msgstr "" +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/page/organizational_chart/organizational_chart.js:154 +#: hrms/hr_setup/sidebar/hr_setup/hr_setup.json #: hrms/workspace_sidebar/hr_setup.json msgid "Organizational Chart" msgstr "" @@ -7519,11 +7524,11 @@ msgstr "" #. Label of the overtime_section (Section Break) field in DocType 'Attendance' #. Label of the overtime_section (Section Break) field in DocType 'Shift Type' -#. Label of a Card Break in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/attendance/attendance.json #: hrms/hr/doctype/shift_type/shift_type.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Overtime" msgstr "" @@ -7559,10 +7564,10 @@ msgid "Overtime Salary Component" msgstr "" #. Name of a DocType -#. Label of a Link in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/overtime_slip/overtime_slip.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Overtime Slip" msgstr "" @@ -7622,7 +7627,7 @@ msgstr "" #. Name of a DocType #. Label of the overtime_type (Link) field in DocType 'Shift Assignment' #. Label of the overtime_type (Link) field in DocType 'Shift Type' -#. Label of a Link in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/attendance/attendance.json #: hrms/hr/doctype/employee_checkin/employee_checkin.json @@ -7630,7 +7635,7 @@ msgstr "" #: hrms/hr/doctype/overtime_type/overtime_type.json #: hrms/hr/doctype/shift_assignment/shift_assignment.json #: hrms/hr/doctype/shift_type/shift_type.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Overtime Type" msgstr "" @@ -7765,7 +7770,7 @@ msgstr "" msgid "Payment Days Calculation Help" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:148 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:149 msgid "Payment Days Dependency" msgstr "" @@ -7801,13 +7806,14 @@ msgstr "" #. Label of a Desktop Icon #. Label of the payroll (Section Break) field in DocType 'Leave Encashment' +#. Title of a Sidebar #. Name of a Workspace -#. Label of a Card Break in the Payroll Workspace #. Title of a Workspace Sidebar #: hrms/desktop_icon/payroll.json #: hrms/hr/doctype/leave_encashment/leave_encashment.json #: hrms/overrides/dashboard_overrides.py:42 #: hrms/overrides/dashboard_overrides.py:98 +#: hrms/payroll/sidebar/payroll/payroll.json #: hrms/payroll/workspace/payroll/payroll.json #: hrms/workspace_sidebar/payroll.json msgid "Payroll" @@ -7907,7 +7913,6 @@ msgstr "" #. Proof Submission' #. Label of the payroll_period (Link) field in DocType 'Payroll Correction' #. Name of a DocType -#. Label of a Link in the Payroll Workspace #: frontend/src/views/salary_slip/Dashboard.vue:21 #: hrms/payroll/doctype/arrear/arrear.json #: hrms/payroll/doctype/employee_benefit_application/employee_benefit_application.json @@ -7919,7 +7924,6 @@ msgstr "" #: hrms/payroll/doctype/payroll_period/payroll_period.json #: hrms/payroll/report/accrued_earnings_report/accrued_earnings_report.js:62 #: hrms/payroll/report/income_tax_computation/income_tax_computation.js:18 -#: hrms/payroll/workspace/payroll/payroll.json msgid "Payroll Period" msgstr "" @@ -7935,14 +7939,7 @@ msgstr "" msgid "Payroll Periods" msgstr "" -#. Label of a Card Break in the Payroll Workspace -#: hrms/payroll/workspace/payroll/payroll.json -msgid "Payroll Reports" -msgstr "" - -#. Label of a Link in the HR Setup Workspace #. Name of a DocType -#: hrms/hr/workspace/hr_setup/hr_setup.json #: hrms/payroll/doctype/payroll_settings/payroll_settings.json msgid "Payroll Settings" msgstr "" @@ -7996,10 +7993,12 @@ msgid "Percent of CTC (%)" msgstr "" #. Label of a Desktop Icon +#. Title of a Sidebar #. Name of a Workspace #. Title of a Workspace Sidebar #: hrms/desktop_icon/performance.json -#: hrms/hr/workspace/performance/performance.json +#: hrms/performance/sidebar/performance/performance.json +#: hrms/performance/workspace/performance/performance.json #: hrms/workspace_sidebar/performance.json msgid "Performance" msgstr "" @@ -8029,7 +8028,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:911 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:914 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -8073,7 +8072,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2260 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2272 msgid "Please see attachment" msgstr "" @@ -8119,7 +8118,7 @@ msgstr "" msgid "Please select a company first." msgstr "" -#: hrms/hr/doctype/attendance/attendance.py:389 +#: hrms/hr/doctype/attendance/attendance.py:395 msgid "Please select a date." msgstr "" @@ -8180,7 +8179,7 @@ msgstr "" msgid "Please select the salary slips to email" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:314 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:316 msgid "Please set \"Default Payroll Payable Account\" in Company Defaults" msgstr "" @@ -8196,7 +8195,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:591 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:594 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8241,7 +8240,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:382 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8291,7 +8290,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:228 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8428,10 +8427,10 @@ msgid "Processing of Shift Requests has been queued. It may take a few minutes." msgstr "" #. Name of a report -#. Label of a Link in the Payroll Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/payroll/report/professional_tax_deductions/professional_tax_deductions.json -#: hrms/payroll/workspace/payroll/payroll.json +#: hrms/payroll/sidebar/payroll/payroll.json #: hrms/workspace_sidebar/payroll.json msgid "Professional Tax Deductions" msgstr "" @@ -8446,10 +8445,10 @@ msgid "Profit" msgstr "" #. Name of a report -#. Label of a Link in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/report/project_profitability/project_profitability.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Project Profitability" msgstr "" @@ -8459,6 +8458,11 @@ msgstr "" msgid "Promotion Date" msgstr "" +#. Label of a number card in the Tenure Workspace +#: hrms/tenure/workspace/tenure/tenure.json +msgid "Promotions (This Month)" +msgstr "" + #: hrms/hr/employee_property_update.js:172 msgid "Property already added" msgstr "" @@ -8468,9 +8472,7 @@ msgid "Provide a short reason for leave." msgstr "" #. Name of a report -#. Label of a Link in the Payroll Workspace #: hrms/payroll/report/provident_fund_deductions/provident_fund_deductions.json -#: hrms/payroll/workspace/payroll/payroll.json msgid "Provident Fund Deductions" msgstr "" @@ -8505,14 +8507,14 @@ msgstr "" msgid "Purpose & Amount" msgstr "" +#. Label of a Sidebar Item #. Name of a DocType #. Label of the purpose_of_travel (Data) field in DocType 'Purpose of Travel' #. Label of the purpose_of_travel (Link) field in DocType 'Travel Request' -#. Label of a Link in the Expenses Workspace #. Label of a Workspace Sidebar Item +#: hrms/expenses/sidebar/expenses/expenses.json #: hrms/hr/doctype/purpose_of_travel/purpose_of_travel.json #: hrms/hr/doctype/travel_request/travel_request.json -#: hrms/hr/workspace/expenses/expenses.json #: hrms/workspace_sidebar/expenses.json msgid "Purpose of Travel" msgstr "" @@ -8628,22 +8630,22 @@ msgstr "" #. Label of a Desktop Icon #. Label of the recruitment_tab (Tab Break) field in DocType 'HR Settings' +#. Title of a Sidebar #. Name of a Workspace #. Title of a Workspace Sidebar #: hrms/desktop_icon/recruitment.json #: hrms/hr/doctype/hr_settings/hr_settings.json -#: hrms/hr/workspace/recruitment/recruitment.json +#: hrms/recruitment/sidebar/recruitment/recruitment.json +#: hrms/recruitment/workspace/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Recruitment" msgstr "" #. Name of a report -#. Label of a Link in the HR Setup Workspace -#. Label of a Link in the Recruitment Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/report/recruitment_analytics/recruitment_analytics.json -#: hrms/hr/workspace/hr_setup/hr_setup.json -#: hrms/hr/workspace/recruitment/recruitment.json +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Recruitment Analytics" msgstr "" @@ -8714,6 +8716,11 @@ msgstr "" msgid "Reject Employee Referral" msgstr "" +#. Label of a number card in the Expenses Workspace +#: hrms/expenses/workspace/expenses/expenses.json +msgid "Rejected Claims (This Month)" +msgstr "" + #: frontend/src/components/RequestActionSheet.vue:298 msgid "Rejection" msgstr "" @@ -8892,9 +8899,7 @@ msgid "Retained" msgstr "" #. Name of a DocType -#. Label of a Link in the Payroll Workspace #: hrms/payroll/doctype/retention_bonus/retention_bonus.json -#: hrms/payroll/workspace/payroll/payroll.json msgid "Retention Bonus" msgstr "" @@ -8954,8 +8959,10 @@ msgstr "" msgid "Role Allowed to Create Backdated Leave Application" msgstr "" +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/public/js/utils/index.js:275 hrms/public/js/utils/index.js:296 +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Roster" msgstr "" @@ -8988,23 +8995,23 @@ msgstr "" msgid "Route to the custom Job Application Webform" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:121 msgid "Row #{0}: Cannot set amount or formula for Salary Component {1} with Variable Based On Taxable Salary" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:139 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:140 msgid "Row #{0}: The {1} Component has the options {2} and {3} enabled." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:163 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:165 msgid "Row #{0}: Timesheet amount will overwrite the Earning component amount for the Salary Component {1}" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:859 +#: hrms/hr/doctype/expense_claim/expense_claim.py:932 msgid "Row No {0}: Amount cannot be greater than the Outstanding Amount against Expense Claim {1}. Outstanding Amount is {2}" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:557 +#: hrms/hr/doctype/expense_claim/expense_claim.py:564 msgid "Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2}" msgstr "" @@ -9052,7 +9059,7 @@ msgstr "" #. Label of the salary_component (Link) field in DocType 'Retention Bonus' #. Name of a DocType #. Label of the salary_component (Link) field in DocType 'Salary Structure' -#. Label of a Link in the Payroll Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/overtime_salary_component/overtime_salary_component.json #: hrms/payroll/doctype/additional_salary/additional_salary.json @@ -9065,7 +9072,7 @@ msgstr "" #: hrms/payroll/doctype/salary_structure/salary_structure.json #: hrms/payroll/report/accrued_earnings_report/accrued_earnings_report.js:77 #: hrms/payroll/report/accrued_earnings_report/accrued_earnings_report.py:33 -#: hrms/payroll/workspace/payroll/payroll.json +#: hrms/payroll/sidebar/payroll/payroll.json #: hrms/public/js/utils/payroll_utils.js:23 hrms/workspace_sidebar/payroll.json msgid "Salary Component" msgstr "" @@ -9098,11 +9105,11 @@ msgstr "" msgid "Salary Component for timesheet based payroll." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:499 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:501 msgid "Salary Component {0} cannot be selected more than once in Employee Benefits" msgstr "" -#: hrms/payroll/doctype/salary_component/salary_component.js:113 +#: hrms/payroll/doctype/salary_component/salary_component.js:119 msgid "Salary Component {0} is currently not used in any Salary Structure." msgstr "" @@ -9139,16 +9146,12 @@ msgid "Salary Paid Per" msgstr "" #. Name of a report -#. Label of a Link in the Payroll Workspace #: hrms/payroll/report/salary_payments_based_on_payment_mode/salary_payments_based_on_payment_mode.json -#: hrms/payroll/workspace/payroll/payroll.json msgid "Salary Payments Based On Payment Mode" msgstr "" #. Name of a report -#. Label of a Link in the Payroll Workspace #: hrms/payroll/report/salary_payments_via_ecs/salary_payments_via_ecs.json -#: hrms/payroll/workspace/payroll/payroll.json msgid "Salary Payments via ECS" msgstr "" @@ -9157,10 +9160,10 @@ msgid "Salary Range" msgstr "" #. Name of a report -#. Label of a Link in the Payroll Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/payroll/report/salary_register/salary_register.json -#: hrms/payroll/workspace/payroll/payroll.json +#: hrms/payroll/sidebar/payroll/payroll.json #: hrms/workspace_sidebar/payroll.json msgid "Salary Register" msgstr "" @@ -9171,14 +9174,14 @@ msgstr "" #. Label of the column_break_rnoq (Section Break) field in DocType 'Payroll #. Settings' #. Name of a DocType -#. Label of a Link in the Payroll Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/leave_application/leave_application.json #: hrms/hr/doctype/overtime_slip/overtime_slip.json #: hrms/payroll/doctype/employee_benefit_ledger/employee_benefit_ledger.json #: hrms/payroll/doctype/payroll_settings/payroll_settings.json #: hrms/payroll/doctype/salary_slip/salary_slip.json -#: hrms/payroll/workspace/payroll/payroll.json hrms/setup.py:370 +#: hrms/payroll/sidebar/payroll/payroll.json hrms/setup.py:370 #: hrms/workspace_sidebar/payroll.json msgid "Salary Slip" msgstr "" @@ -9234,11 +9237,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:414 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:422 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9283,26 +9286,26 @@ msgstr "" #. Name of a DocType #. Label of the salary_structure (Link) field in DocType 'Salary Structure #. Assignment' -#. Label of a Link in the Payroll Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/payroll/doctype/arrear/arrear.json #: hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.json -#: hrms/payroll/doctype/salary_component/salary_component.js:31 +#: hrms/payroll/doctype/salary_component/salary_component.js:37 #: hrms/payroll/doctype/salary_slip/salary_slip.json #: hrms/payroll/doctype/salary_structure/salary_structure.json #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json -#: hrms/payroll/workspace/payroll/payroll.json +#: hrms/payroll/sidebar/payroll/payroll.json #: hrms/public/js/erpnext/employee.js:40 hrms/workspace_sidebar/payroll.json msgid "Salary Structure" msgstr "" #. Name of a DocType -#. Label of a Link in the Payroll Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.js:8 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json #: hrms/payroll/report/employee_ctc_break_up/employee_ctc_break_up.js:51 -#: hrms/payroll/workspace/payroll/payroll.json +#: hrms/payroll/sidebar/payroll/payroll.json #: hrms/workspace_sidebar/payroll.json msgid "Salary Structure Assignment" msgstr "" @@ -9311,7 +9314,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:116 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9319,7 +9322,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 msgid "Salary Structure Missing" msgstr "" @@ -9331,7 +9334,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:140 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9339,17 +9342,17 @@ msgstr "" msgid "Salary Structure: " msgstr "" -#: hrms/payroll/doctype/salary_component/salary_component.js:150 +#: hrms/payroll/doctype/salary_component/salary_component.js:156 msgid "Salary Structures updated successfully" msgstr "" #. Label of the salary_withholding (Link) field in DocType 'Salary Slip' #. Name of a DocType -#. Label of a Link in the Payroll Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/payroll/doctype/salary_slip/salary_slip.json #: hrms/payroll/doctype/salary_withholding/salary_withholding.json -#: hrms/payroll/workspace/payroll/payroll.json +#: hrms/payroll/sidebar/payroll/payroll.json #: hrms/workspace_sidebar/payroll.json msgid "Salary Withholding" msgstr "" @@ -9385,7 +9388,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2685 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2697 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9402,7 +9405,7 @@ msgstr "" msgid "Sanctioned Amount (Company Currency)" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:581 +#: hrms/hr/doctype/expense_claim/expense_claim.py:588 msgid "Sanctioned Amount cannot be greater than Claim Amount in Row {0}." msgstr "" @@ -9546,11 +9549,11 @@ msgstr "" msgid "Select your Leave Approver i.e. the person who approves or rejects your leaves." msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.js:605 +#: hrms/hr/doctype/expense_claim/expense_claim.js:604 msgid "Selected employee advance is not of employee {0}" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:550 +#: hrms/hr/doctype/expense_claim/expense_claim.py:555 msgid "Selected employee advance is not of employee {}" msgstr "" @@ -9704,7 +9707,7 @@ msgstr "" msgid "Set optional filters to fetch employees in the appraisee list" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:669 +#: hrms/hr/doctype/expense_claim/expense_claim.py:676 msgid "Set the default account for the {0} {1}" msgstr "" @@ -9744,10 +9747,12 @@ msgid "Shared document with the user {0} with 'Submit' permission" msgstr "" #. Label of a Desktop Icon +#. Title of a Sidebar #. Name of a Workspace #. Title of a Workspace Sidebar #: hrms/desktop_icon/shift_&_attendance.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/workspace/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Shift & Attendance" msgstr "" @@ -9772,9 +9777,7 @@ msgid "Shift Actual Start Time" msgstr "" #. Name of a DocType -#. Label of a Link in the Shift & Attendance Workspace #: hrms/hr/doctype/shift_assignment/shift_assignment.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json msgid "Shift Assignment" msgstr "" @@ -9789,9 +9792,7 @@ msgid "Shift Assignment History" msgstr "" #. Name of a DocType -#. Label of a Link in the Shift & Attendance Workspace #: hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json #: hrms/public/js/utils/index.js:263 hrms/public/js/utils/index.js:285 msgid "Shift Assignment Tool" msgstr "" @@ -9805,10 +9806,10 @@ msgid "Shift Assignments created for the schedule between {0} and {1} via backgr msgstr "" #. Name of a report -#. Label of a Link in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/report/shift_attendance/shift_attendance.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Shift Attendance" msgstr "" @@ -9836,25 +9837,25 @@ msgstr "" #. Name of a DocType #. Label of the shift_location (Link) field in DocType 'Shift Schedule #. Assignment' -#. Label of a Link in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/shift_assignment/shift_assignment.json #: hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json #: hrms/hr/doctype/shift_location/shift_location.json #: hrms/hr/doctype/shift_schedule_assignment/shift_schedule_assignment.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Shift Location" msgstr "" #. Label of the shift_request (Link) field in DocType 'Shift Assignment' #. Name of a DocType -#. Label of a Link in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/shift_assignment/shift_assignment.json #: hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js:220 #: hrms/hr/doctype/shift_request/shift_request.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Shift Request" msgstr "" @@ -9885,13 +9886,13 @@ msgstr "" #. Name of a DocType #. Label of the shift_schedule (Link) field in DocType 'Shift Schedule #. Assignment' -#. Label of a Link in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json #: hrms/hr/doctype/shift_schedule/shift_schedule.json #: hrms/hr/doctype/shift_schedule_assignment/shift_schedule_assignment.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json #: hrms/public/js/erpnext/employee.js:53 +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Shift Schedule" msgstr "" @@ -9899,10 +9900,8 @@ msgstr "" #. Label of the shift_schedule_assignment (Link) field in DocType 'Shift #. Assignment' #. Name of a DocType -#. Label of a Link in the Shift & Attendance Workspace #: hrms/hr/doctype/shift_assignment/shift_assignment.json #: hrms/hr/doctype/shift_schedule_assignment/shift_schedule_assignment.json -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json msgid "Shift Schedule Assignment" msgstr "" @@ -9945,7 +9944,7 @@ msgstr "" #. Label of the shift_type (Link) field in DocType 'Shift Request' #. Label of the shift_type (Link) field in DocType 'Shift Schedule' #. Name of a DocType -#. Label of a Link in the Shift & Attendance Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: frontend/src/views/attendance/ShiftAssignmentList.vue:24 #: frontend/src/views/attendance/ShiftRequestList.vue:42 @@ -9956,7 +9955,7 @@ msgstr "" #: hrms/hr/doctype/shift_schedule/shift_schedule.json #: hrms/hr/doctype/shift_type/shift_type.json #: hrms/hr/report/shift_attendance/shift_attendance.js:28 -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json +#: hrms/shift_and_attendance/sidebar/shift_&_attendance/shift_&_attendance.json #: hrms/workspace_sidebar/shift_&_attendance.json msgid "Shift Type" msgstr "" @@ -9975,11 +9974,6 @@ msgstr "" msgid "Shift has been successfully updated to {0}." msgstr "" -#. Label of a Card Break in the Shift & Attendance Workspace -#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json -msgid "Shifts" -msgstr "" - #: hrms/hr/doctype/job_applicant/job_applicant.js:59 msgid "Shortlist" msgstr "" @@ -10061,7 +10055,7 @@ msgstr "" msgid "Skip Auto Attendance" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:358 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:360 msgid "Skipping Salary Structure Assignment for the following employees, as Salary Structure Assignment records already exists against them. {0}" msgstr "" @@ -10082,12 +10076,12 @@ msgstr "" #. Label of the staffing_plan (Link) field in DocType 'Job Opening' #. Name of a DocType -#. Label of a Link in the Recruitment Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/job_opening/job_opening.json #: hrms/hr/doctype/staffing_plan/staffing_plan.json #: hrms/hr/report/recruitment_analytics/recruitment_analytics.py:24 -#: hrms/hr/workspace/recruitment/recruitment.json +#: hrms/recruitment/sidebar/recruitment/recruitment.json #: hrms/workspace_sidebar/recruitment.json msgid "Staffing Plan" msgstr "" @@ -10127,7 +10121,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1896 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1908 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10179,7 +10173,7 @@ msgstr "" msgid "Strictly based on Log Type in Employee Checkin" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:295 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:297 msgid "Structures have been assigned successfully" msgstr "" @@ -10267,12 +10261,12 @@ msgstr "" msgid "Summarized View" msgstr "" -#: hrms/payroll/doctype/salary_component/salary_component.js:99 +#: hrms/payroll/doctype/salary_component/salary_component.js:105 msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1407 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1419 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:452 msgid "Syntax error" msgstr "" @@ -10287,10 +10281,12 @@ msgid "Take Exact Completed Years" msgstr "" #. Label of a Desktop Icon +#. Title of a Sidebar #. Name of a Workspace #. Title of a Workspace Sidebar #: hrms/desktop_icon/tax_&_benefits.json -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json +#: hrms/tax_and_benefits/sidebar/tax_&_benefits/tax_&_benefits.json +#: hrms/tax_and_benefits/workspace/tax_&_benefits/tax_&_benefits.json #: hrms/workspace_sidebar/tax_&_benefits.json msgid "Tax & Benefits" msgstr "" @@ -10298,7 +10294,7 @@ msgstr "" #. Label of the tax_deducted_till_date (Currency) field in DocType 'Salary #. Structure Assignment' #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:232 msgid "Tax Deducted Till Date" msgstr "" @@ -10323,9 +10319,9 @@ msgstr "" msgid "Tax Exemption Proofs" msgstr "" -#. Label of a Card Break in the Tax & Benefits Workspace -#: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json -msgid "Tax Setup" +#. Label of a number card in the Tax & Benefits Workspace +#: hrms/tax_and_benefits/workspace/tax_&_benefits/tax_&_benefits.json +msgid "Tax Exemption Proofs (This Year)" msgstr "" #. Label of the tax_on_additional_salary (Currency) field in DocType 'Salary @@ -10343,7 +10339,7 @@ msgstr "" #. Label of the taxable_earnings_till_date (Currency) field in DocType 'Salary #. Structure Assignment' #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Taxable Earnings Till Date" msgstr "" @@ -10404,13 +10400,19 @@ msgstr "" #. Label of a Desktop Icon #. Label of the tenure_tab (Tab Break) field in DocType 'HR Settings' +#. Title of a Sidebar #. Name of a Workspace #. Title of a Workspace Sidebar #: hrms/desktop_icon/tenure.json hrms/hr/doctype/hr_settings/hr_settings.json -#: hrms/hr/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json +#: hrms/tenure/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Tenure" msgstr "" +#: hrms/templates/emails/training_event.html:20 +msgid "Thank you" +msgstr "" + #. Success message of the job-application Web Form #: hrms/hr/web_form/job_application/job_application.json msgid "Thank you for applying." @@ -10494,7 +10496,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:588 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:591 msgid "There are more holidays than working days this month." msgstr "" @@ -10512,11 +10514,11 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:83 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:460 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:517 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:449 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:451 msgid "There's no Employee with Salary Structure: {0}. Assign {1} to an Employee to preview Salary Slip" msgstr "" @@ -10542,18 +10544,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1415 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:403 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1427 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:460 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:396 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1420 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:453 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:389 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1413 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:446 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10678,6 +10680,11 @@ msgstr "" msgid "Total Absent" msgstr "" +#. Label of a number card in the Shift & Attendance Workspace +#: hrms/shift_and_attendance/workspace/shift_&_attendance/shift_&_attendance.json +msgid "Total Absent (This Month)" +msgstr "" + #: hrms/payroll/report/accrued_earnings_report/accrued_earnings_report.py:46 msgid "Total Accrued" msgstr "" @@ -10720,6 +10727,11 @@ msgstr "" msgid "Total Amount cannot be zero" msgstr "" +#. Label of a number card in the Recruitment Workspace +#: hrms/recruitment/workspace/recruitment/recruitment.json +msgid "Total Applicants (This month)" +msgstr "" + #. Label of the total_asset_recovery_cost (Currency) field in DocType 'Full and #. Final Statement' #: hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json @@ -10749,6 +10761,11 @@ msgstr "" msgid "Total Days Without Pay" msgstr "" +#. Label of a number card in the Tax & Benefits Workspace +#: hrms/tax_and_benefits/workspace/tax_&_benefits/tax_&_benefits.json +msgid "Total Declaration Submitted" +msgstr "" + #. Label of the total_declared_amount (Currency) field in DocType 'Employee Tax #. Exemption Declaration' #: hrms/payroll/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.json @@ -10783,6 +10800,11 @@ msgstr "" msgid "Total Earnings" msgstr "" +#. Label of a number card in the HR Setup Workspace +#: hrms/hr_setup/workspace/hr_setup/hr_setup.json +msgid "Total Employees" +msgstr "" + #. Label of the total_estimated_budget (Currency) field in DocType 'Staffing #. Plan' #: hrms/hr/doctype/staffing_plan/staffing_plan.json @@ -10832,6 +10854,11 @@ msgstr "" msgid "Total Hours (T)" msgstr "" +#. Label of a number card in the Payroll Workspace +#: hrms/payroll/workspace/payroll/payroll.json +msgid "Total Incentive Given(Last month)" +msgstr "" + #. Label of the total_income_tax (Currency) field in DocType 'Salary Slip' #: hrms/payroll/doctype/salary_slip/salary_slip.json msgid "Total Income Tax" @@ -10882,6 +10909,11 @@ msgstr "" msgid "Total Non-Billed Hours" msgstr "" +#. Label of a number card in the Payroll Workspace +#: hrms/payroll/workspace/payroll/payroll.json +msgid "Total Outgoing Salary(Last month)" +msgstr "" + #. Label of the total_overtime_duration (Float) field in DocType 'Overtime #. Slip' #: hrms/hr/doctype/overtime_slip/overtime_slip.json @@ -10907,6 +10939,11 @@ msgstr "" msgid "Total Present" msgstr "" +#. Label of a number card in the Shift & Attendance Workspace +#: hrms/shift_and_attendance/workspace/shift_&_attendance/shift_&_attendance.json +msgid "Total Present (This Month)" +msgstr "" + #: hrms/setup.py:843 msgid "Total Principal Amount" msgstr "" @@ -10921,6 +10958,11 @@ msgstr "" msgid "Total Resignations" msgstr "" +#. Label of a number card in the Payroll Workspace +#: hrms/payroll/workspace/payroll/payroll.json +msgid "Total Salary Structure" +msgstr "" + #. Label of the total_sanctioned_amount (Currency) field in DocType 'Expense #. Claim' #: hrms/hr/doctype/expense_claim/expense_claim.json @@ -10944,7 +10986,7 @@ msgstr "" msgid "Total Self Score" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:575 +#: hrms/hr/doctype/expense_claim/expense_claim.py:582 msgid "Total advance amount cannot be greater than total sanctioned amount" msgstr "" @@ -10974,7 +11016,7 @@ msgstr "" msgid "Total leaves allocated is mandatory for Leave Type {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:523 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:525 msgid "Total of all employee benefits cannot be greater that Max Benefits Amount {0}" msgstr "" @@ -11004,7 +11046,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:257 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:259 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11030,9 +11072,7 @@ msgid "Trainer Name" msgstr "" #. Label of the training (Link) field in DocType 'Employee Training' -#. Label of a Card Break in the Tenure Workspace #: hrms/hr/doctype/employee_training/employee_training.json -#: hrms/hr/workspace/tenure/tenure.json #: hrms/overrides/dashboard_overrides.py:57 msgid "Training" msgstr "" @@ -11045,16 +11085,15 @@ msgstr "" #. Name of a DocType #. Label of the training_event (Link) field in DocType 'Training Feedback' #. Label of the training_event (Link) field in DocType 'Training Result' -#. Label of a Link in the Tenure Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/training_event/training_event.json #: hrms/hr/doctype/training_feedback/training_feedback.json #: hrms/hr/doctype/training_feedback/training_feedback.py:33 #: hrms/hr/doctype/training_result/training_result.json #: hrms/hr/doctype/training_result/training_result.py:32 -#: hrms/hr/workspace/tenure/tenure.json #: hrms/templates/emails/training_event.html:1 -#: hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Training Event" msgstr "" @@ -11072,31 +11111,31 @@ msgid "Training Events" msgstr "" #. Name of a DocType -#. Label of a Link in the Tenure Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/training_event/training_event.js:16 #: hrms/hr/doctype/training_feedback/training_feedback.json -#: hrms/hr/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Training Feedback" msgstr "" #. Label of the training_program (Link) field in DocType 'Training Event' #. Name of a DocType #. Label of the training_program (Data) field in DocType 'Training Program' -#. Label of a Link in the Tenure Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/training_event/training_event.json #: hrms/hr/doctype/training_program/training_program.json -#: hrms/hr/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Training Program" msgstr "" #. Name of a DocType -#. Label of a Link in the Tenure Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item #: hrms/hr/doctype/training_event/training_event.js:10 #: hrms/hr/doctype/training_result/training_result.json -#: hrms/hr/workspace/tenure/tenure.json hrms/workspace_sidebar/tenure.json +#: hrms/tenure/sidebar/tenure/tenure.json hrms/workspace_sidebar/tenure.json msgid "Training Result" msgstr "" @@ -11113,7 +11152,7 @@ msgid "Trainings" msgstr "" #. Label of a quick_list in the Tenure Workspace -#: hrms/hr/workspace/tenure/tenure.json +#: hrms/tenure/workspace/tenure/tenure.json msgid "Trainings (This Week)" msgstr "" @@ -11126,9 +11165,9 @@ msgstr "" msgid "Transfer Date" msgstr "" -#. Label of a Card Break in the Expenses Workspace +#. Label of a Sidebar Item #. Label of a Workspace Sidebar Item -#: hrms/hr/workspace/expenses/expenses.json hrms/setup.py:397 +#: hrms/expenses/sidebar/expenses/expenses.json hrms/setup.py:397 #: hrms/workspace_sidebar/expenses.json msgid "Travel" msgstr "" @@ -11157,13 +11196,11 @@ msgstr "" msgid "Travel Itinerary" msgstr "" +#. Label of a Sidebar Item #. Name of a DocType -#. Label of a Link in the Expenses Workspace -#. Label of a Link in the HR Setup Workspace #. Label of a Workspace Sidebar Item +#: hrms/expenses/sidebar/expenses/expenses.json #: hrms/hr/doctype/travel_request/travel_request.json -#: hrms/hr/workspace/expenses/expenses.json -#: hrms/hr/workspace/hr_setup/hr_setup.json #: hrms/workspace_sidebar/expenses.json msgid "Travel Request" msgstr "" @@ -11257,11 +11294,11 @@ msgstr "" msgid "Unpaid Accrual" msgstr "" +#. Label of a Sidebar Item #. Name of a report -#. Label of a Link in the Expenses Workspace #. Label of a Workspace Sidebar Item +#: hrms/expenses/sidebar/expenses/expenses.json #: hrms/hr/report/unpaid_expense_claim/unpaid_expense_claim.json -#: hrms/hr/workspace/expenses/expenses.json #: hrms/workspace_sidebar/expenses.json msgid "Unpaid Expense Claim" msgstr "" @@ -11321,7 +11358,7 @@ msgstr "" msgid "Update Response" msgstr "" -#: hrms/payroll/doctype/salary_component/salary_component.js:120 +#: hrms/payroll/doctype/salary_component/salary_component.js:126 msgid "Update Salary Structures" msgstr "" @@ -11430,26 +11467,26 @@ msgstr "" msgid "Vegetarian" msgstr "" +#. Label of a Sidebar Item #. Name of a report -#. Label of a Link in the Expenses Workspace #. Label of a Workspace Sidebar Item +#: hrms/expenses/sidebar/expenses/expenses.json #: hrms/hr/doctype/vehicle_log/vehicle_log.py:55 #: hrms/hr/doctype/vehicle_log/vehicle_log.py:93 #: hrms/hr/doctype/vehicle_log/vehicle_log.py:135 #: hrms/hr/report/vehicle_expenses/vehicle_expenses.json -#: hrms/hr/workspace/expenses/expenses.json #: hrms/workspace_sidebar/expenses.json msgid "Vehicle Expenses" msgstr "" +#. Label of a Sidebar Item #. Label of the vehicle_log (Link) field in DocType 'Expense Claim' #. Name of a DocType -#. Label of a Link in the Expenses Workspace #. Label of a Workspace Sidebar Item +#: hrms/expenses/sidebar/expenses/expenses.json #: hrms/hr/doctype/expense_claim/expense_claim.json #: hrms/hr/doctype/vehicle_log/vehicle_log.json #: hrms/hr/report/vehicle_expenses/vehicle_expenses.py:38 -#: hrms/hr/workspace/expenses/expenses.json #: hrms/workspace_sidebar/expenses.json msgid "Vehicle Log" msgstr "" @@ -11460,9 +11497,7 @@ msgid "Vehicle Service" msgstr "" #. Name of a DocType -#. Label of a Link in the Expenses Workspace #: hrms/hr/doctype/vehicle_service_item/vehicle_service_item.json -#: hrms/hr/workspace/expenses/expenses.json msgid "Vehicle Service Item" msgstr "" @@ -11860,7 +11895,7 @@ msgstr "" msgid "the selected company" msgstr "" -#: hrms/payroll/doctype/salary_component/salary_component.py:188 +#: hrms/payroll/doctype/salary_component/salary_component.py:195 msgid "via Salary Component sync" msgstr "" @@ -11902,7 +11937,7 @@ msgstr "" msgid "{0} Missing" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.py:78 +#: hrms/payroll/doctype/salary_structure/salary_structure.py:79 msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" @@ -12029,7 +12064,7 @@ msgstr "" msgid "{0} was assigned {1}" msgstr "" -#: hrms/payroll/doctype/salary_component/salary_component.js:130 +#: hrms/payroll/doctype/salary_component/salary_component.js:136 msgid "{0} will be updated for the following Salary Structures: {1}." msgstr "" @@ -12041,7 +12076,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2294 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2306 msgid "{0}: Employee email not found, hence email not sent" msgstr "" @@ -12049,13 +12084,6 @@ msgstr "" msgid "{0}: From {0} of type {1}" msgstr "" -#: frontend/src/components/AttendanceRequestItem.vue:17 -#: frontend/src/components/LeaveRequestItem.vue:16 -#: frontend/src/components/ShiftAssignmentItem.vue:12 -#: frontend/src/components/ShiftRequestItem.vue:17 -msgid "{0}d" -msgstr "" - #: hrms/hr/doctype/job_requisition/job_requisition.js:22 msgid "{} {} open for this position." msgstr "" diff --git a/hrms/payroll/doctype/salary_slip/salary_slip.py b/hrms/payroll/doctype/salary_slip/salary_slip.py index 064f298cb73..c09e4de1382 100644 --- a/hrms/payroll/doctype/salary_slip/salary_slip.py +++ b/hrms/payroll/doctype/salary_slip/salary_slip.py @@ -2,6 +2,8 @@ # License: GNU General Public License v3. See license.txt +import datetime + import frappe from frappe import _, msgprint from frappe.model.document import Document @@ -16,6 +18,7 @@ date_diff, floor, flt, + format_datetime, formatdate, get_first_day, get_last_day, @@ -2543,9 +2546,43 @@ def unlink_ref_doc_from_salary_slip(doc, method=None): frappe.db.set_value("Salary Slip", ss_doc.name, "journal_entry", "") +class SystemFormattedDate(datetime.date): + """Date that renders in the system date format when interpolated into a password policy. + + Subclasses `date` so that policies relying on the underlying object, like + `{date_of_birth.year}` or `{date_of_birth:%d%m%Y}`, keep working. + """ + + def __str__(self): + return formatdate(datetime.date(self.year, self.month, self.day)) + + +class SystemFormattedDatetime(datetime.datetime): + """Datetime counterpart of `SystemFormattedDate`.""" + + def __str__(self): + return format_datetime( + datetime.datetime( + self.year, self.month, self.day, self.hour, self.minute, self.second, self.microsecond + ) + ) + + +def format_dates_in_system_format(value): + # datetime is a subclass of date, so it has to be checked first + if isinstance(value, datetime.datetime): + return SystemFormattedDatetime( + value.year, value.month, value.day, value.hour, value.minute, value.second, value.microsecond + ) + if isinstance(value, datetime.date): + return SystemFormattedDate(value.year, value.month, value.day) + return value + + def generate_password_for_pdf(policy_template, employee): employee = frappe.get_cached_doc("Employee", employee) - return policy_template.format(**employee.as_dict()) + values = {key: format_dates_in_system_format(value) for key, value in employee.as_dict().items()} + return policy_template.format(**values) def get_salary_component_data(component): diff --git a/hrms/payroll/doctype/salary_slip/test_salary_slip.py b/hrms/payroll/doctype/salary_slip/test_salary_slip.py index 2f2a8c21382..43422542ee6 100644 --- a/hrms/payroll/doctype/salary_slip/test_salary_slip.py +++ b/hrms/payroll/doctype/salary_slip/test_salary_slip.py @@ -43,6 +43,7 @@ TAX_COMPONENTS_BY_COMPANY, SalarySlip, _safe_eval, + generate_password_for_pdf, make_salary_slip_from_timesheet, ) from hrms.payroll.doctype.salary_structure.salary_structure import make_salary_slip @@ -922,6 +923,19 @@ def test_email_salary_slip_with_email_template(self): self.assertIsNotNone(get_email_by_subject("Test Salary Slip Email Template")) + @HRMSTestSuite.change_settings("System Settings", {"date_format": "dd-mm-yyyy"}) + def test_pdf_password_uses_system_date_format(self): + emp_id = make_employee("test_pdf_password@salary.com", company="_Test Company") + + # the format is cached per request, reset it so that the changed setting is picked up + frappe.local.user_date_format = None + self.addCleanup(setattr, frappe.local, "user_date_format", None) + + self.assertEqual(generate_password_for_pdf("{date_of_birth}", emp_id), "08-05-1990") + # the value is still a date, so attribute access and format specs keep working + self.assertEqual(generate_password_for_pdf("SAL-{date_of_birth.year}", emp_id), "SAL-1990") + self.assertEqual(generate_password_for_pdf("{date_of_birth:%d%m%Y}", emp_id), "08051990") + def test_payroll_frequency(self): fiscal_year = get_fiscal_year(nowdate(), company="_Test Company")[0] month = "%02d" % getdate(nowdate()).month
{0}{1}