diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a0394c46ca..87f97f1f01 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -5,7 +5,7 @@ # the repo. Unless a later match takes precedence. hrms/hr/ @ruchamahabal @asmitahase -hrms/payroll/ @ruchamahabal @AyshaHakeem @iamraheelkhan +hrms/payroll/ @ruchamahabal @AyshaHakeem @iamkhanraheel frontend/ @ruchamahabal @asmitahase roster/ @ruchamahabal @asmitahase diff --git a/hrms/hr/report/monthly_attendance_sheet/test_monthly_attendance_sheet.py b/hrms/hr/report/monthly_attendance_sheet/test_monthly_attendance_sheet.py index bb45d141d7..43898fdad5 100644 --- a/hrms/hr/report/monthly_attendance_sheet/test_monthly_attendance_sheet.py +++ b/hrms/hr/report/monthly_attendance_sheet/test_monthly_attendance_sheet.py @@ -323,9 +323,9 @@ def test_attendance_with_employee_filter(self): self.assertEqual(leaves[2], 1) def test_attendance_with_company_filter(self): - create_company("Test Parent Company", is_group=1) - create_company("Test Child Company", is_group=1, parent_company="Test Parent Company") - create_company("Test Grandchild Company", parent_company="Test Child Company") + create_company("Test Parent Company", is_group=1, abbr="TPC-HR") + create_company("Test Child Company", is_group=1, parent_company="Test Parent Company", abbr="TCC-HR") + create_company("Test Grandchild Company", parent_company="Test Child Company", abbr="TGC-HR") employee1 = make_employee("test_employee@parent.com", company="Test Parent Company") employee2 = make_employee("test_employee@child.com", company="Test Child Company") diff --git a/hrms/locale/ar.po b/hrms/locale/ar.po index f0bc41c5f2..97920f2a02 100644 --- a/hrms/locale/ar.po +++ b/hrms/locale/ar.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:40\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Arabic\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "إضافة الاجازات غير المستخدمة من المخصص msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "الراتب السنوي" @@ -1712,7 +1718,7 @@ msgstr "لا يمكن أن يكون تاريخ الدفع المكافأ تار msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "الموظف {0} لديه اجازة نصف يوم في {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "الموظفون يعملون في يوم العطلة" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "من تاريخ {0} لا يمكن أن يكون بعد تاريخ التخفيف من الموظف {1}" @@ -4404,7 +4422,7 @@ msgstr "من تاريخ {0} لا يمكن أن يكون بعد تاريخ الت msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "من تاريخ {0} لا يمكن أن يكون قبل تاريخ الانضمام للموظف {1}" @@ -5170,7 +5188,7 @@ msgstr "استقطاعات ضريبة الدخل" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "لوح ضريبة الدخل" msgid "Income Tax Slab Other Charges" msgstr "لوحة ضريبة الدخل رسوم أخرى" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "يجب أن يكون لوح ضريبة الدخل ساريًا في أو قبل تاريخ بدء فترة الرواتب: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "لم يتم تعيين لوح ضريبة الدخل في تعيين هيكل الرواتب: {0}" @@ -5200,7 +5218,7 @@ msgstr "لم يتم تعيين لوح ضريبة الدخل في تعيين هي msgid "Income Tax Slab: " msgstr "لوح ضريبة الدخل: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "شريحة ضريبة الدخل: {0} معطل" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "وصف معيار التقييم" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "نوع الإجازة {0} غير قابل للضبط" msgid "Leave Without Pay" msgstr "اجازة من دون راتب" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "لا تتطابق الإجازة بدون أجر مع سجلات {} المعتمدة" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "صافي الأجر لا يمكن أن يكون أقل من 0" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "لم يتم العثور على أي نشاط أو هيكل راتب إفتراضي للموظف {0} للتواريخ المدخلة\\n
\\nNo active or default Salary Structure found for employee {0} for the given dates" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "الموافقون فقط هم من يمكنهم الموافقة على هذا الطلب." @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "يمكن إعتماد الطلبات التي حالتها 'معتمدة' و 'مرفوضة' فقط\\n
\\nOnly Leave Applications with status 'Approved' and 'Rejected' can be submitted" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "يمكن فقط تقديم طلب التحول بالحالة "موافق عليه" و "مرفوض"" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "يرجى تعيين كشوف المرتبات على أساس إعدادات الرواتب" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "يرجى تعيين الشركة" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "يرجى تحديد تاريخ الالتحاق بالموظف {0}" @@ -8198,7 +8217,7 @@ msgstr "يرجى حصة ملاحظاتك للتدريب من خلال النقر msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "معاينة كشف الراتب" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "كشف الراتب للموظف {0} تم إنشاؤه لهذه الفترة" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "كشف الراتب للموظف {0} تم إنشاؤه لسجل التوقيت {1}" @@ -9208,7 +9227,7 @@ msgstr "تعيين هيكل الراتب" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "تعيين هيكل الراتب للموظف موجود بالفعل" @@ -9216,7 +9235,7 @@ msgstr "تعيين هيكل الراتب للموظف موجود بالفعل" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "هيكلية الراتب مفقودة" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "واجب التحول: {0} تم إنشاؤه للموظف: {1}" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "إظهار أوراق جميع أعضاء القسم في التقويم" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "عرض كشف الراتب" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "الإجازات المرضية" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "معيار الإعفاء الضريبي" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "تواريخ البدء والانتهاء ليست في فترة كشوف المرتبات الصالحة ، ولا يمكن حساب {0}." @@ -10160,7 +10179,8 @@ msgstr "عرض موجز" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "الوقت الذي يسبق وقت بدء التحول الذي يتم msgid "Theory" msgstr "نظرية" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "أيام العطل لهذا الشهر أكثر من أيام العمل.\\n
\\nThere are more holidays than working days this month." @@ -10396,7 +10416,7 @@ msgstr "لا توجد وظائف شاغرة في إطار خطة التوظيف #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "هذا الموظف لديه بالفعل سجل بنفس الطابع الزمني. {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "عدد ساعات العمل الكلي يجب ألا يكون أكثر من العدد الأقصى لساعات العمل {0}" @@ -11593,7 +11616,7 @@ msgstr "أنت لست موجودًا طوال اليوم (الأيام) بين msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "لا يمكنك طلب التحول الافتراضي الخاص بك: {0}" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "{0} يجب تسليمها" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: البريد الإلكتروني للموظف غير موجود، وبالتالي لن يتم إرسال البريد الإلكتروني" diff --git a/hrms/locale/bs.po b/hrms/locale/bs.po index eb58eb17c4..bc26569bb2 100644 --- a/hrms/locale/bs.po +++ b/hrms/locale/bs.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-09 15:37\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:55\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Bosnian\n" "MIME-Version: 1.0\n" @@ -525,7 +525,7 @@ msgstr "Dodaj neiskorištene praznike iz prethodnih dodjela" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "Dodaj neiskorištene praznike iz dodjela prethodnog perioda praznika u ovu dodjelu" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "Dodane komponente poreza iz Postavki Komponente Plate jer struktura plata nije imala nikakvu poresku komponentu." @@ -872,6 +872,12 @@ msgstr "Godišnja Dodjela je premašena" msgid "Annual CTC" msgstr "Godišnji Plata" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "Godišnja Bruto Zarada" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Godišnja Plata" @@ -1737,7 +1743,7 @@ msgstr "Datum Uplate Bonusa ne može biti prošli datum" msgid "Branch: {0}" msgstr "Grana: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "Masovna Dodjela" @@ -1839,11 +1845,11 @@ msgstr "Nije moguće otkazati Dodjelu Smjene: {0} jer je povezana sa Prisustvom: msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "Nije moguće otkazati Dodjelu Smjenae {0} jer je povezano sa Prijavom Personala: {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "Ne može se kreirati Platni List za pridruživanje personala nakon Obračunskog Perioda" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "Ne može se kreirati Platni List za personal otpušten prije Obračunskog Perioda" @@ -2305,7 +2311,7 @@ msgstr "Kriterijum na osnovu kojeg personal treba procijeniti u Povratnim Inform msgid "Currency " msgstr "Valuta " -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "Valuta odabrane Tabele Poreza na Platu bi trebala biti {0} umjesto {1}" @@ -3433,7 +3439,7 @@ msgstr "{0} već ima aktivnu smjenu {1}: {2} koja se preklapa u ovom periodu." msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "{0} je već predao zahtjev {1} za period obračuna plata {2}" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "{0} se već prijavio za smjenu {1}: {2} koja se preklapa u ovom periodu" @@ -3461,7 +3467,7 @@ msgstr "{0} nije pronađen među učesnicima obuke." msgid "Employee {0} on Half day on {1}" msgstr "{0} na pola dana {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "{0} razriješen {1} mora biti postavljen kao 'Napustio'" @@ -3526,6 +3532,17 @@ msgstr "Personal bez Ciljeva: {0}" msgid "Employees working on a holiday" msgstr "Praznični Personal" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "Doprinos Poslodavca" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "Doprinosi Poslodavca" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3679,7 +3696,8 @@ msgstr "Greška pri brisanju {0}" msgid "Error downloading PDF" msgstr "Greška pri preuzimanju PDF-a" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "Greška u formuli ili stanju" @@ -3695,7 +3713,7 @@ msgstr "Greška u nekim redovima" msgid "Error updating {0}" msgstr "Greška pri ažuriranju {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "Greška prilikom procjene {doctype} {doclink} u redu {row_id}.

Greška: {error}

Savjet: {description}" @@ -4424,7 +4442,7 @@ msgstr "Od datuma mora biti prije Do datuma" msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "Datum od {0} ne može biti nakon datuma završetka perioda obračuna plata {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "Od datuma {0} ne može biti nakon datuma razrješenja {1}" @@ -4432,7 +4450,7 @@ msgstr "Od datuma {0} ne može biti nakon datuma razrješenja {1}" msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "Datum od {0} ne može biti prije datuma početka perioda obračuna plata {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "Od datuma {0} ne može biti prije datuma zapošljenja {1}" @@ -5198,7 +5216,7 @@ msgstr "Odbici Poreza na Platu" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5212,15 +5230,15 @@ msgstr "Tabela Poreza na Platu" msgid "Income Tax Slab Other Charges" msgstr "Tabela Porez na Platu Ostale Naknade" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "Tabela Poreza na Platu je obavezna jer Struktura Plate {0} ima poresku komponentu {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "Tabela Poreza na Platu mora biti na snazi na ili prije datuma početka obračunskog perioda: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "Tabela Poreza na Platu nije postavljena u Dodjeli Strukture Plata: {0}" @@ -5228,7 +5246,7 @@ msgstr "Tabela Poreza na Platu nije postavljena u Dodjeli Strukture Plata: {0}" msgid "Income Tax Slab: " msgstr "Tabela Poreza na Platu: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "Tabela Poreza na Platu: {0} je onemogućena" @@ -5464,7 +5482,7 @@ msgstr "Nevažeći Iznosi Beneficija" msgid "Invalid Dates" msgstr "Nevažeći Datumi" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "Nevažeći neplačeni dani su poništeni" @@ -5836,7 +5854,7 @@ msgstr "Ključno Polje Odgovornosti" msgid "Key Result Area" msgstr "Ključno Polje Rezultata" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "Nevažeči neplaćeni dani ({0}) ne odgovaraju stvarnom ukupnom iznosu korekcija platnog spiska ({1}) za {2} od {3} do {4}" @@ -6253,7 +6271,7 @@ msgstr "Tip Odsutva {0} nije moguće unovčiti" msgid "Leave Without Pay" msgstr "Neplaćeno Odsustvo" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "Neplaćeno Odsustvo ne odgovara odobrenim {} zapisima" @@ -6740,11 +6758,11 @@ msgstr "Minimalni broj kalendarskih dana obaveznih od datuma pridruživanja da b msgid "Missing Advance Account" msgstr "Nedostaje Račun Predujma" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "Nedostaje Obavezno Polje" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "Nedostaju Početni Unosi" @@ -6756,7 +6774,7 @@ msgstr "Nedostaje Datum Otkaza" msgid "Missing Salary Components" msgstr "Nedostaju Komponente Plate" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "Nedostaje Porezna Tabela" @@ -6829,7 +6847,8 @@ msgid "My Requests" msgstr "Moji Zahtjevi" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "Greška Imena" @@ -6857,7 +6876,7 @@ msgstr "Neto Plata (Valuta Poduzeća)" msgid "Net Pay Info" msgstr "Neto Plata" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "Neto Plata ne može biti manja od 0" @@ -6988,7 +7007,7 @@ msgstr "Nije pronađena aktivna dodjela strukture plate za {0} sa strukturom pla 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 "Nije pronađen aktivni personal povezan s ID-om e-pošte {0}. Pokušaj se prijaviti sa svojim ID-om e-pošte ili se obratite svom personalnom upravitelju za pristup." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "Nije pronađena aktivna ili standard struktura plata za personal {0} za date datume" @@ -7169,7 +7188,7 @@ msgstr "Napomena: Smjena neće biti prepisana u postojećem zapisu prisutnosti" msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "Napomena: Ukupan broj dodijeljenog odsustva {0} ne bi trebao biti manji od već odobrenog odsustva {1} za period" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "Napomena: Vaš platni list je zaštićen lozinkom, lozinka za otključavanje PDF-a je formata {0}." @@ -7314,7 +7333,7 @@ msgstr "Aktivnosti Introdukcije" msgid "Onboarding Begins On" msgstr "Introdukcija Počinje" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "Samo Odobravatelji mogu odobriti ovaj zahtjev." @@ -7338,7 +7357,7 @@ msgstr "Samo Intervjui sa statusom \"Obrađen\" ili \"Odbijen\" mogu se podnijet msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "Samo Zahtjevi Odsustva sa statusom \"Odobren\" i \"Odbijen\" mogu se podnijeti" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "Samo Zahtjev Smjene sa statusom \"Odobren\" i \"Odbijen\" može se podnijeti" @@ -7432,7 +7451,7 @@ msgstr "Preklapajući Zahtjev za Prisustvo" msgid "Overlapping Shift Attendance" msgstr "Preklapajuće Prisustvo Smjene" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "Preklapajući Zahtjevi za Smjenu" @@ -7956,7 +7975,7 @@ msgstr "Omogući Automatsko Prisustvo i prvo dovršite podešavanje." msgid "Please Select Company First" msgstr "Odaberi Poduzeće" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "Dodijeli Strukturu Plata za {0} primjenjivu od ili prije {1}" @@ -8000,7 +8019,7 @@ msgstr "Popuni podatke za Personal, Datum Registracije i Poduzeće prije nego š msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "Smanji {0} kako biste izbjegli preklapanje vremena smjene sa samom sobom" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "Pogledaj Prilog" @@ -8127,7 +8146,7 @@ msgstr "Postavi komponentu Zarade za Tip Odsustva: {0}." msgid "Please set Leave Approver for the Employee: {0}" msgstr "Postavi Odobravatelja Odsustva za: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "Postavi Obračun Plata na osnovu Postavki Obračuna Plata" @@ -8172,7 +8191,7 @@ msgstr "Postavi Šablon Ocjenjivanjaza sve {0} ili odaberi šablon u tabeli Pers msgid "Please set the Company" msgstr "Postavi Poduzeće" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "Postavi Datum zapošljavanja za {0}" @@ -8226,7 +8245,7 @@ msgstr "Podijeli Povratne Informacije obuke klikom na 'Povratne Informacije Obuk msgid "Please specify the job applicant to be updated." msgstr "Navedi kandidata za posao kojeg treba ažurirati." -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "Navedi {0} i {1} (ako ih ima), za tačan obračun poreza u budućim platnim listovima." @@ -8284,8 +8303,8 @@ msgstr "Spriječite samoodobrenje za zahtjeve za troškove čak i ako korisnik i msgid "Prevent self approval for leaves even if user has permissions" msgstr "Spriječi samoodobrenje za odsustvo čak i ako korisnik ima dozvole" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "Pregled Platnog Lista" @@ -9159,11 +9178,11 @@ msgstr "Kreiranje Platnog Lista je u redu čekanja. Može potrajati nekoliko min msgid "Salary Slip not found." msgstr "Platna Lista nije pronađena." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "Platni List {0} je već kreiran za ovaj period" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "Platni List {0} je već kreiran za radni list {1}" @@ -9236,7 +9255,7 @@ msgstr "Dodjela Strukture Plata" msgid "Salary Structure Assignment field" msgstr "Polje Dodjele Strukture Plate" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "Struktura Plate za Personal već postoji" @@ -9244,7 +9263,7 @@ msgstr "Struktura Plate za Personal već postoji" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "Dodjeljivanje Strukture Plate nije pronađeno za {0} na datum {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "Nedostaje Struktura Plate" @@ -9256,7 +9275,7 @@ msgstr "Struktura Plate mora biti dostavljena prije podnošenja {0}" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "Struktura Plate nije dodijeljena za {0} za datum {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "Struktura Plate {0} ne pripada {1}" @@ -9310,7 +9329,7 @@ msgstr "Komponente plate tipa Providentni fond, Dodatni Providentni fond ili Zaj msgid "Salary components should be part of the Salary Structure." msgstr "Komponente Plate trebaju biti dio Strukture Plate." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "Slanje Platnih Listi e-poštom stavljeni su u red za slanje. Provjerite {0} za status." @@ -9715,7 +9734,7 @@ msgstr "Istorija Dodjele Smjene" msgid "Shift Assignment Tool" msgstr "Alat Dodjele Smjene" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "Dodjela Smjene: {0} kreirana za personal: {1}" @@ -9923,7 +9942,7 @@ msgstr "Prikaži Stanje Odsustva u Platnom Listu" msgid "Show Leaves Of All Department Members In Calendar" msgstr "Prikaži odsustvo svih Članova Odjela u Kalendaru" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "Prikaži Platni List" @@ -9935,7 +9954,7 @@ msgstr "Trenutno se prikazuje" msgid "Sick Leave" msgstr "Bolovanje" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "Pojedinačna Dodjela" @@ -10044,7 +10063,7 @@ msgstr "Standardni Iznos Izuzeća od Poreza" msgid "Standard Working Hours" msgstr "Standardno Radno Vrijeme" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "Datum početka i završetka nije u važećem obračunskom periodu, ne može se izračunati {0}." @@ -10188,7 +10207,8 @@ msgstr "Sažeti Prikaz" msgid "Sync {0}" msgstr "Sinhronizuj {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "Sintaksička greška" @@ -10214,7 +10234,7 @@ msgstr "Porez&Beneficije" #. 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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "Odbijen Porez do Datuma" @@ -10259,7 +10279,7 @@ msgstr "Porez na Fleksibilne Beneficije" #. 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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "Oporeziva Zarada do Datuma" @@ -10406,7 +10426,7 @@ msgstr "Vrijeme prije početka smjene tokom kojeg se prijava personala smatra za msgid "Theory" msgstr "Teorija" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "Ovaj mjesec ima više praznika nego radnih dana." @@ -10424,7 +10444,7 @@ msgstr "Nema slobodnih radnih mjesta prema planu zapošljavanja {0}" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "Nije dodijeljena struktura plata za {0}. Prvo dodijeli strukturu plata." @@ -10454,15 +10474,18 @@ msgstr "Ovo kompenzacijsko odsustvo će se primjenjivati od {0}." msgid "This employee already has a log with the same timestamp.{0}" msgstr "Personal već ima yapisnik sa istom vremenskom oznakom.{0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "Ova greška može biti posljedica nevažeće formule ili uvjeta." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "Ova greška može biti zbog nevažeće sintakse." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "Ova greška može biti zbog toga što polje nedostaje ili je izbrisano." @@ -10917,7 +10940,7 @@ msgstr "Ukupna težina za sve {0} mora biti suma do 100. Trenutno je {1}%" msgid "Total working Days Per Year" msgstr "Ukupno Radnih Dana u Godini" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "Ukupno radno vrijeme ne smije biti veće od maksimalnog radnog vremena {0}" @@ -11621,7 +11644,7 @@ msgstr "Niste prisutni cijeli dan(e) između dana zahtjeva za kompenzacijsko ods msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "Ne možete definirati više tabela ako imate tabelu bez donjih i gornjih granica." -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "Ne možete zatražiti svoju Standard Smjenu: {0}" @@ -11641,6 +11664,10 @@ msgstr "Možete učitati samo JPG, PNG, PDF, TXT ili Microsoft dokumente." msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "Ne možete stornirati više od ukupnog broja neplačenih odsutnih dana {0}. Već ste stornirali {1} dana za ovoj personal." +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "Nemate dozvolu za promjenu statusa zahtjeva za smjenu." + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11817,7 +11844,7 @@ msgstr "{0} Nedostaje" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} Red #{1}: Formula je postavljena, ali {2} je onemogućeno za Komponentu Plate {3}." -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} Red #{1}: {2} treba omogućiti da bi se formula razmatrala." @@ -11904,7 +11931,7 @@ msgstr "{0} odsustva je ručno dodijelio {1} na {2}" msgid "{0} must be submitted" msgstr "{0} se mora poslati" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} od {1} Završeno" @@ -11940,7 +11967,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "{0}. Za više detalja provjerite zapisnik grešaka." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: E-pošta za personal nije pronađena, stoga e-pošta nije poslana" diff --git a/hrms/locale/cs.po b/hrms/locale/cs.po index de372a182a..c4a2e04936 100644 --- a/hrms/locale/cs.po +++ b/hrms/locale/cs.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "" @@ -1712,7 +1718,7 @@ msgstr "" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4404,7 +4422,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5170,7 +5188,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5200,7 +5218,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8198,7 +8217,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9208,7 +9227,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9216,7 +9235,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10160,7 +10179,8 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10396,7 +10416,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11593,7 +11616,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/locale/da.po b/hrms/locale/da.po index ee2c92acdb..e94bead37d 100644 --- a/hrms/locale/da.po +++ b/hrms/locale/da.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "" @@ -1712,7 +1718,7 @@ msgstr "" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4404,7 +4422,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5170,7 +5188,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5200,7 +5218,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8198,7 +8217,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9208,7 +9227,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9216,7 +9235,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10160,7 +10179,8 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10396,7 +10416,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11593,7 +11616,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/locale/de.po b/hrms/locale/de.po index 471a6a8626..c4608e7ceb 100644 --- a/hrms/locale/de.po +++ b/hrms/locale/de.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: German\n" "MIME-Version: 1.0\n" @@ -506,7 +506,7 @@ msgstr "Ungenutzten Urlaub von vorherigen Zuteilungen hinzufügen" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "Ungenutzte Urlaubstage aus der Zuteilung des vorherigen Urlaubszeitraums zu dieser Zuteilung hinzufügen" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "Steuerkomponenten aus dem Gehaltskomponentenstamm hinzugefügt, da die Gehaltsstruktur keine Steuerkomponente enthielt." @@ -853,6 +853,12 @@ msgstr "Jährliche Zuteilung überschritten" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Jahresgehalt" @@ -1718,7 +1724,7 @@ msgstr "Das Bonuszahlungsdatum kann kein vergangenes Datum sein" msgid "Branch: {0}" msgstr "Zweigstelle: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "Massenzuweisungen" @@ -1820,11 +1826,11 @@ msgstr "Schichtzuweisung {0} kann nicht storniert werden, da sie mit Anwesenheit msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "Schichtzuweisung {0} kann nicht storniert werden, da sie mit dem Mitarbeiter-Check-in {1} verknüpft ist" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "Für Mitarbeiter, die nach der Abrechnungsperiode eintreten, kann keine Gehaltsabrechnung erstellt werden" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "Für einen Mitarbeiter, der vor dem Abrechnungszeitraum ausgeschieden ist, kann keine Gehaltsabrechnung erstellt werden" @@ -2283,7 +2289,7 @@ msgstr "Kriterien, anhand derer der Mitarbeiter im Leistungsfeedback und in der msgid "Currency " msgstr "Währung " -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "Die Währung des ausgewählten Einkommensteuertarifs sollte {0} statt {1} sein" @@ -3411,7 +3417,7 @@ msgstr "Der Mitarbeiter {0} hat bereits einen aktiven Shift {1}: {2}, der sich m msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "Mitarbeiter {0} hat bereits eine Bewerbung {1} für die Abrechnungsperiode {2} eingereicht" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "Mitarbeiter {0} hat sich bereits für die Schicht {1}: {2} beworben, die sich mit diesem Zeitraum überschneidet" @@ -3439,7 +3445,7 @@ msgstr "Mitarbeiter {0} nicht in den Teilnehmern der Schulungsveranstaltung gefu msgid "Employee {0} on Half day on {1}" msgstr "Mitarbeiter {0} am {1} nur halbtags anwesend" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "Am {1} freigestellter Mitarbeiter {0} muss als „Entlassen“ gekennzeichnet werden" @@ -3504,6 +3510,17 @@ msgstr "Mitarbeiter ohne Zielvorgaben: {0}" msgid "Employees working on a holiday" msgstr "Arbeitnehmer, die an einem Feiertag arbeiten" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3657,7 +3674,8 @@ msgstr "Fehler beim Löschen von {0}" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "Fehler in Formel oder Bedingung" @@ -3673,7 +3691,7 @@ msgstr "Fehler in einigen Zeilen" msgid "Error updating {0}" msgstr "Fehler beim Aktualisieren von {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4402,7 +4420,7 @@ msgstr "Von-Datum muss vor Bis-Datum liegen" msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "Ab Datum {0} kann nicht nach dem Entlastungsdatum des Mitarbeiters sein {1}" @@ -4410,7 +4428,7 @@ msgstr "Ab Datum {0} kann nicht nach dem Entlastungsdatum des Mitarbeiters sein msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "Von Datum {0} kann nicht vor dem Beitrittsdatum des Mitarbeiters sein {1}" @@ -5176,7 +5194,7 @@ msgstr "Einkommensteuerabzüge" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5190,15 +5208,15 @@ msgstr "Einkommensteuerplatte" msgid "Income Tax Slab Other Charges" msgstr "Einkommensteuerplatte Sonstige Gebühren" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "Die Einkommensteuerklasse ist obligatorisch, da die Gehaltsstruktur {0} eine Steuerkomponente {1} hat" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "Die Einkommensteuerplatte muss am oder vor dem Startdatum der Abrechnungsperiode wirksam sein: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "Einkommensteuerplatte nicht in Gehaltsstrukturzuordnung festgelegt: {0}" @@ -5206,7 +5224,7 @@ msgstr "Einkommensteuerplatte nicht in Gehaltsstrukturzuordnung festgelegt: {0}" msgid "Income Tax Slab: " msgstr "Einkommensteuerplatte: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "Einkommensteuerplatte: {0} ist deaktiviert" @@ -5442,7 +5460,7 @@ msgstr "" msgid "Invalid Dates" msgstr "Ungültige Daten" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5814,7 +5832,7 @@ msgstr "Entscheidender Verantwortungsbereich" msgid "Key Result Area" msgstr "Key Result Area" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6231,7 +6249,7 @@ msgstr "Abwesenheitsart {0} ist nicht umsetzbar" msgid "Leave Without Pay" msgstr "Unbezahlter Urlaub" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "Urlaub ohne Bezahlung stimmt nicht mit genehmigten {} Datensätzen überein" @@ -6718,11 +6736,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "Fehlendes Pflichtfeld" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6734,7 +6752,7 @@ msgstr "Fehlendes Austrittsdatum" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6807,7 +6825,8 @@ msgid "My Requests" msgstr "Meine Anfragen" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "Namensfehler" @@ -6835,7 +6854,7 @@ msgstr "Nettogehalt (Währung des Unternehmens)" msgid "Net Pay Info" msgstr "Infos zum Nettogehalt" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "Net Pay kann nicht kleiner als 0" @@ -6966,7 +6985,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "Keine aktive oder Standard-Gehaltsstruktur für Mitarbeiter gefunden {0} für die angegebenen Daten" @@ -7147,7 +7166,7 @@ msgstr "Hinweis: Die Schicht wird in vorhandenen Anwesenheitsdatensätzen nicht msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "Hinweis: Die Summe der zugeteilten Abwesenheiten {0} sollte nicht geringer sein als die bereits genehmigten Abwesenheiten {1} für den Zeitraum" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "Hinweis: Ihre Gehaltsabrechnung ist passwortgeschützt, das Passwort zum Entsperren der PDF hat das Format {0}." @@ -7292,7 +7311,7 @@ msgstr "Onboarding-Aktivitäten" msgid "Onboarding Begins On" msgstr "Das Onboarding beginnt am" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "Nur Genehmigende können diese Anfrage genehmigen." @@ -7316,7 +7335,7 @@ msgstr "Es können nur Interviews mit dem Status \"Freigegeben\" oder \"Abgelehn msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "Nur Urlaubsanträge mit dem Status \"Gewährt\" und \"Abgelehnt\" können übermittelt werden." -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "Es kann nur eine Schichtanforderung mit den Status "Genehmigt" und "Abgelehnt" eingereicht werden" @@ -7410,7 +7429,7 @@ msgstr "Überlappende Anwesenheitsanfragen" msgid "Overlapping Shift Attendance" msgstr "Überlappende Schichtanwesenheit" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "Überlappende Schichtanfragen" @@ -7934,7 +7953,7 @@ msgstr "Bitte aktivieren Sie die automatische Anwesenheit und schließen Sie zun msgid "Please Select Company First" msgstr "Bitte wählen Sie zuerst das Unternehmen aus" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7978,7 +7997,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "Siehe Anhang" @@ -8105,7 +8124,7 @@ msgstr "Bitte stellen Sie die Verdienstkomponente für die Abwesenheitsart ein: msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "Bitte stellen Sie die Personalabrechnung basierend auf den Einstellungen für die Personalabrechnung ein" @@ -8150,7 +8169,7 @@ msgstr "Bitte stellen Sie die Beurteilungsvorlage für alle {0} ein oder wählen msgid "Please set the Company" msgstr "Bitte setzen Sie das Unternehmen" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "Bitte setzen Sie das Datum des Beitritts für Mitarbeiter {0}" @@ -8204,7 +8223,7 @@ msgstr "Bitte teilen Sie Ihr Feedback mit dem Training ab, indem Sie auf 'Tr msgid "Please specify the job applicant to be updated." msgstr "Bitte geben Sie den Bewerber an, der aktualisiert werden soll." -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8262,8 +8281,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "Verhindert die Selbstgenehmigung für Urlaub, auch wenn der Benutzer über die entsprechenden Berechtigungen verfügt." -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "Vorschau Gehaltsabrechnung" @@ -9137,11 +9156,11 @@ msgstr "Die Erstellung der Gehaltsabrechnung befindet sich in der Warteschlange. msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "Gehaltsabrechnung der Mitarbeiter {0} für diesen Zeitraum bereits erstellt" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "Gehaltsabrechnung der Mitarbeiter {0} bereits für Zeitblatt erstellt {1}" @@ -9214,7 +9233,7 @@ msgstr "Zuordnung der Gehaltsstruktur" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "Die Gehaltsstrukturzuordnung für den Mitarbeiter ist bereits vorhanden" @@ -9222,7 +9241,7 @@ msgstr "Die Gehaltsstrukturzuordnung für den Mitarbeiter ist bereits vorhanden" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "Gehaltsstruktur Fehlende" @@ -9234,7 +9253,7 @@ msgstr "Die Gehaltsstruktur muss vor der Einreichung von {0} gebucht werden" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "Gehaltsstruktur {0} gehört nicht zum Unternehmen {1}" @@ -9288,7 +9307,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "Gehaltskomponenten sollten Teil der Gehaltsstruktur sein." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "E-Mails mit Gehaltsabrechnungen wurden in die Warteschlange für den Versand gestellt. Prüfen Sie den Status unter {0}." @@ -9693,7 +9712,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "Tool zur Schichtzuweisung" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "Schichtzuweisung: {0} erstellt für Mitarbeiter: {1}" @@ -9901,7 +9920,7 @@ msgstr "Abwesenheiten in der Gehaltsabrechnung anzeigen" msgid "Show Leaves Of All Department Members In Calendar" msgstr "Abwesenheiten aller Abteilungsmitglieder im Kalender anzeigen" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "Anzeigen Gehaltsabrechnung" @@ -9913,7 +9932,7 @@ msgstr "" msgid "Sick Leave" msgstr "Krankheitsbedingte Abwesenheit" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "Einzelne Zuweisung" @@ -10022,7 +10041,7 @@ msgstr "Standard Steuerbefreiungsbetrag" msgid "Standard Working Hours" msgstr "Standard-Arbeitszeiten" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "Start- und Enddatum, die nicht in einer gültigen Abrechnungsperiode sind, können {0} nicht berechnen." @@ -10166,7 +10185,8 @@ msgstr "Zusammenfassende Ansicht" msgid "Sync {0}" msgstr "{0} synchronisieren" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "Syntaxfehler" @@ -10192,7 +10212,7 @@ msgstr "Steuern & Sozialleistungen" #. 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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "Abgezogene Steuern bis Datum" @@ -10237,7 +10257,7 @@ msgstr "Steuer auf flexiblen Vorteil" #. 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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "Steuerpflichtiges Einkommen bis heute" @@ -10384,7 +10404,7 @@ msgstr "Die Zeit vor dem Schichtbeginn, in der der Mitarbeiter-Check-in für die msgid "Theory" msgstr "Theorie" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "Es gibt mehr Feiertage als Arbeitstage in diesem Monat." @@ -10402,7 +10422,7 @@ msgstr "Es gibt keine offenen Stellen im Besetzungsplan {0}" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10432,15 +10452,18 @@ msgstr "Dieser Ausgleichsurlaub gilt ab {0}." msgid "This employee already has a log with the same timestamp.{0}" msgstr "Dieser Mitarbeiter hat bereits ein Protokoll mit demselben Zeitstempel. {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "Dieser Fehler kann auf eine ungültige Formel oder Bedingung zurückzuführen sein." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "Dieser Fehler kann auf eine ungültige Syntax zurückzuführen sein." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "Dieser Fehler kann auf ein fehlendes oder gelöschtes Feld zurückzuführen sein." @@ -10895,7 +10918,7 @@ msgstr "Die Gesamtgewichtung für alle {0} muss 100 ergeben. Derzeit beträgt si msgid "Total working Days Per Year" msgstr "Gesamtarbeitstage pro Jahr" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "Insgesamt Arbeitszeit sollte nicht größer sein als die maximale Arbeitszeit {0}" @@ -11599,7 +11622,7 @@ msgstr "Sie sind nicht den ganzen Tag (oder mehreren Tagen) zwischen den Ausglei msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "Sie können keine Standard-Schicht anfordern: {0}" @@ -11619,6 +11642,10 @@ msgstr "Sie können nur JPG-, PNG-, PDF-, TXT- oder Microsoft-Dokumente hochlade msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11795,7 +11822,7 @@ msgstr "{0} fehlt" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} Zeile #{1}: Die Formel ist festgelegt, aber {2} ist für die Gehaltskomponente {3} deaktiviert." -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} Zeile #{1}: {2} muss aktiviert sein, damit die Formel berücksichtigt werden kann." @@ -11882,7 +11909,7 @@ msgstr "{0} Abwesenheiten wurden manuell von {1} auf {2} zugewiesen" msgid "{0} must be submitted" msgstr "{0} muss eingereicht werden" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} von {1} abgeschlossen" @@ -11918,7 +11945,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: Mitarbeiter E-Mail nicht gefunden, E-Mail daher nicht gesendet" diff --git a/hrms/locale/eo.po b/hrms/locale/eo.po index 178250605a..88d07ba3da 100644 --- a/hrms/locale/eo.po +++ b/hrms/locale/eo.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:55\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Esperanto\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "crwdns140892:0crwdne140892:0" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "crwdns140894:0crwdne140894:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "crwdns104932:0crwdne104932:0" @@ -847,6 +847,12 @@ msgstr "crwdns149070:0crwdne149070:0" msgid "Annual CTC" msgstr "crwdns201895:0crwdne201895:0" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "crwdns203951:0crwdne203951:0" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "crwdns105158:0crwdne105158:0" @@ -1712,7 +1718,7 @@ msgstr "crwdns105494:0crwdne105494:0" msgid "Branch: {0}" msgstr "crwdns105512:0{0}crwdne105512:0" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "crwdns105514:0crwdne105514:0" @@ -1814,11 +1820,11 @@ msgstr "crwdns148516:0{0}crwdnd148516:0{1}crwdne148516:0" msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "crwdns148518:0{0}crwdnd148518:0{1}crwdne148518:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "crwdns105558:0crwdne105558:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "crwdns105560:0crwdne105560:0" @@ -2277,7 +2283,7 @@ msgstr "crwdns141230:0crwdne141230:0" msgid "Currency " msgstr "crwdns141232:0crwdne141232:0" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "crwdns105988:0{0}crwdnd105988:0{1}crwdne105988:0" @@ -3405,7 +3411,7 @@ msgstr "crwdns106888:0{0}crwdnd106888:0{1}crwdnd106888:0{2}crwdne106888:0" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "crwdns106890:0{0}crwdnd106890:0{1}crwdnd106890:0{2}crwdne106890:0" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "crwdns106892:0{0}crwdnd106892:0{1}crwdnd106892:0{2}crwdne106892:0" @@ -3433,7 +3439,7 @@ msgstr "crwdns106902:0{0}crwdne106902:0" msgid "Employee {0} on Half day on {1}" msgstr "crwdns106904:0{0}crwdnd106904:0{1}crwdne106904:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "crwdns142906:0{0}crwdnd142906:0{1}crwdne142906:0" @@ -3498,6 +3504,17 @@ msgstr "crwdns106932:0{0}crwdne106932:0" msgid "Employees working on a holiday" msgstr "crwdns106934:0crwdne106934:0" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "crwdns203953:0crwdne203953:0" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "crwdns203955:0crwdne203955:0" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "crwdns151216:0{0}crwdne151216:0" msgid "Error downloading PDF" msgstr "crwdns159532:0crwdne159532:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "crwdns107014:0crwdne107014:0" @@ -3667,7 +3685,7 @@ msgstr "crwdns141420:0crwdne141420:0" msgid "Error updating {0}" msgstr "crwdns151218:0{0}crwdne151218:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "crwdns107018:0{doctype}crwdnd107018:0{doclink}crwdnd107018:0{row_id}crwdnd107018:0{error}crwdnd107018:0{description}crwdne107018:0" @@ -4396,7 +4414,7 @@ msgstr "crwdns107348:0crwdne107348:0" msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "crwdns160024:0{0}crwdnd160024:0{1}crwdne160024:0" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "crwdns107350:0{0}crwdnd107350:0{1}crwdne107350:0" @@ -4404,7 +4422,7 @@ msgstr "crwdns107350:0{0}crwdnd107350:0{1}crwdne107350:0" msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "crwdns160026:0{0}crwdnd160026:0{1}crwdne160026:0" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "crwdns107352:0{0}crwdnd107352:0{1}crwdne107352:0" @@ -5170,7 +5188,7 @@ msgstr "crwdns107716:0crwdne107716:0" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "crwdns107718:0crwdne107718:0" msgid "Income Tax Slab Other Charges" msgstr "crwdns107724:0crwdne107724:0" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "crwdns141690:0{0}crwdnd141690:0{1}crwdne141690:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "crwdns107726:0{0}crwdne107726:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "crwdns107728:0{0}crwdne107728:0" @@ -5200,7 +5218,7 @@ msgstr "crwdns107728:0{0}crwdne107728:0" msgid "Income Tax Slab: " msgstr "crwdns201905:0crwdne201905:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "crwdns107730:0{0}crwdne107730:0" @@ -5436,7 +5454,7 @@ msgstr "crwdns159568:0crwdne159568:0" msgid "Invalid Dates" msgstr "crwdns151982:0crwdne151982:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "crwdns160264:0crwdne160264:0" @@ -5808,7 +5826,7 @@ msgstr "crwdns141778:0crwdne141778:0" msgid "Key Result Area" msgstr "crwdns141780:0crwdne141780:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "crwdns160266:0{0}crwdnd160266:0{1}crwdnd160266:0{2}crwdnd160266:0{3}crwdnd160266:0{4}crwdne160266:0" @@ -6225,7 +6243,7 @@ msgstr "crwdns108194:0{0}crwdne108194:0" msgid "Leave Without Pay" msgstr "crwdns108196:0crwdne108196:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "crwdns108200:0crwdne108200:0" @@ -6712,11 +6730,11 @@ msgstr "crwdns201807:0crwdne201807:0" msgid "Missing Advance Account" msgstr "crwdns159590:0crwdne159590:0" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "crwdns141916:0crwdne141916:0" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "crwdns149172:0crwdne149172:0" @@ -6728,7 +6746,7 @@ msgstr "crwdns108408:0crwdne108408:0" msgid "Missing Salary Components" msgstr "crwdns159592:0crwdne159592:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "crwdns141918:0crwdne141918:0" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "crwdns151276:0crwdne151276:0" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "crwdns108470:0crwdne108470:0" @@ -6829,7 +6848,7 @@ msgstr "crwdns141938:0crwdne141938:0" msgid "Net Pay Info" msgstr "crwdns141940:0crwdne141940:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "crwdns108490:0crwdne108490:0" @@ -6960,7 +6979,7 @@ msgstr "crwdns160030:0{0}crwdnd160030:0{1}crwdnd160030:0{2}crwdne160030:0" 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 "crwdns151284:0{0}crwdne151284:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "crwdns108536:0{0}crwdne108536:0" @@ -7141,7 +7160,7 @@ msgstr "crwdns141988:0crwdne141988:0" msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "crwdns108590:0{0}crwdnd108590:0{1}crwdne108590:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "crwdns141990:0{0}crwdne141990:0" @@ -7286,7 +7305,7 @@ msgstr "crwdns142018:0crwdne142018:0" msgid "Onboarding Begins On" msgstr "crwdns142020:0crwdne142020:0" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "crwdns108650:0crwdne108650:0" @@ -7310,7 +7329,7 @@ msgstr "crwdns108658:0crwdne108658:0" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "crwdns108660:0crwdne108660:0" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "crwdns108662:0crwdne108662:0" @@ -7404,7 +7423,7 @@ msgstr "crwdns108726:0crwdne108726:0" msgid "Overlapping Shift Attendance" msgstr "crwdns108728:0crwdne108728:0" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "crwdns108730:0crwdne108730:0" @@ -7928,7 +7947,7 @@ msgstr "crwdns108938:0crwdne108938:0" msgid "Please Select Company First" msgstr "crwdns108940:0crwdne108940:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "crwdns108946:0{0}crwdnd108946:0{1}crwdne108946:0" @@ -7972,7 +7991,7 @@ msgstr "crwdns159666:0crwdne159666:0" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "crwdns152559:0{0}crwdne152559:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "crwdns142108:0crwdne142108:0" @@ -8099,7 +8118,7 @@ msgstr "crwdns108996:0{0}crwdne108996:0" msgid "Please set Leave Approver for the Employee: {0}" msgstr "crwdns200484:0{0}crwdne200484:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "crwdns108998:0crwdne108998:0" @@ -8144,7 +8163,7 @@ msgstr "crwdns109010:0{0}crwdne109010:0" msgid "Please set the Company" msgstr "crwdns109012:0crwdne109012:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "crwdns109014:0{0}crwdne109014:0" @@ -8198,7 +8217,7 @@ msgstr "crwdns109032:0crwdne109032:0" msgid "Please specify the job applicant to be updated." msgstr "crwdns109034:0crwdne109034:0" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "crwdns149176:0{0}crwdnd149176:0{1}crwdne149176:0" @@ -8256,8 +8275,8 @@ msgstr "crwdns159668:0crwdne159668:0" msgid "Prevent self approval for leaves even if user has permissions" msgstr "crwdns152408:0crwdne152408:0" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "crwdns109072:0crwdne109072:0" @@ -9131,11 +9150,11 @@ msgstr "crwdns109484:0crwdne109484:0" msgid "Salary Slip not found." msgstr "crwdns159690:0crwdne159690:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "crwdns109486:0{0}crwdne109486:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "crwdns109488:0{0}crwdnd109488:0{1}crwdne109488:0" @@ -9208,7 +9227,7 @@ msgstr "crwdns109512:0crwdne109512:0" msgid "Salary Structure Assignment field" msgstr "crwdns142340:0crwdne142340:0" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "crwdns109516:0crwdne109516:0" @@ -9216,7 +9235,7 @@ msgstr "crwdns109516:0crwdne109516:0" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "crwdns159692:0{0}crwdnd159692:0{1}crwdne159692:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "crwdns109518:0crwdne109518:0" @@ -9228,7 +9247,7 @@ msgstr "crwdns109520:0{0}crwdne109520:0" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "crwdns159694:0{0}crwdnd159694:0{1}crwdne159694:0" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "crwdns109526:0{0}crwdnd109526:0{1}crwdne109526:0" @@ -9282,7 +9301,7 @@ msgstr "crwdns159696:0crwdne159696:0" msgid "Salary components should be part of the Salary Structure." msgstr "crwdns142346:0crwdne142346:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "crwdns109534:0{0}crwdne109534:0" @@ -9687,7 +9706,7 @@ msgstr "crwdns151344:0crwdne151344:0" msgid "Shift Assignment Tool" msgstr "crwdns142426:0crwdne142426:0" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "crwdns109734:0{0}crwdnd109734:0{1}crwdne109734:0" @@ -9895,7 +9914,7 @@ msgstr "crwdns142444:0crwdne142444:0" msgid "Show Leaves Of All Department Members In Calendar" msgstr "crwdns142446:0crwdne142446:0" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "crwdns109770:0crwdne109770:0" @@ -9907,7 +9926,7 @@ msgstr "crwdns109774:0crwdne109774:0" msgid "Sick Leave" msgstr "crwdns109776:0crwdne109776:0" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "crwdns109778:0crwdne109778:0" @@ -10016,7 +10035,7 @@ msgstr "crwdns142464:0crwdne142464:0" msgid "Standard Working Hours" msgstr "crwdns142466:0crwdne142466:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "crwdns109860:0{0}crwdne109860:0" @@ -10160,7 +10179,8 @@ msgstr "crwdns109978:0crwdne109978:0" msgid "Sync {0}" msgstr "crwdns142490:0{0}crwdne142490:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "crwdns109990:0crwdne109990:0" @@ -10186,7 +10206,7 @@ msgstr "crwdns110006:0crwdne110006:0" #. 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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "crwdns110008:0crwdne110008:0" @@ -10231,7 +10251,7 @@ msgstr "crwdns142504:0crwdne142504:0" #. 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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "crwdns110026:0crwdne110026:0" @@ -10378,7 +10398,7 @@ msgstr "crwdns142532:0crwdne142532:0" msgid "Theory" msgstr "crwdns142534:0crwdne142534:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "crwdns110080:0crwdne110080:0" @@ -10396,7 +10416,7 @@ msgstr "crwdns110082:0{0}crwdne110082:0" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "crwdns162092:0{0}crwdne162092:0" @@ -10426,15 +10446,18 @@ msgstr "crwdns110092:0{0}crwdne110092:0" msgid "This employee already has a log with the same timestamp.{0}" msgstr "crwdns110094:0{0}crwdne110094:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "crwdns110096:0crwdne110096:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "crwdns110098:0crwdne110098:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "crwdns110100:0crwdne110100:0" @@ -10889,7 +10912,7 @@ msgstr "crwdns110326:0{0}crwdnd110326:0{1}crwdne110326:0" msgid "Total working Days Per Year" msgstr "crwdns142632:0crwdne142632:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "crwdns110330:0{0}crwdne110330:0" @@ -11593,7 +11616,7 @@ msgstr "crwdns110678:0crwdne110678:0" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "crwdns110682:0crwdne110682:0" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "crwdns110684:0{0}crwdne110684:0" @@ -11613,6 +11636,10 @@ msgstr "crwdns110690:0crwdne110690:0" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "crwdns159742:0{0}crwdnd159742:0{1}crwdne159742:0" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "crwdns203957:0crwdne203957:0" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "crwdns110722:0{0}crwdne110722:0" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "crwdns110724:0{0}crwdnd110724:0#{1}crwdnd110724:0{2}crwdnd110724:0{3}crwdne110724:0" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "crwdns110726:0{0}crwdnd110726:0#{1}crwdnd110726:0{2}crwdne110726:0" @@ -11876,7 +11903,7 @@ msgstr "crwdns149074:0{0}crwdnd149074:0{1}crwdnd149074:0{2}crwdne149074:0" msgid "{0} must be submitted" msgstr "crwdns110752:0{0}crwdne110752:0" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "crwdns110754:0{0}crwdnd110754:0{1}crwdne110754:0" @@ -11912,7 +11939,7 @@ msgstr "crwdns110760:0{0}crwdnd110760:0{1}crwdnd110760:0{2}crwdne110760:0" msgid "{0}. Check error log for more details." msgstr "crwdns160898:0{0}crwdne160898:0" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "crwdns110762:0{0}crwdne110762:0" diff --git a/hrms/locale/es.po b/hrms/locale/es.po index 1ec70ef6b6..e8ff6009ec 100644 --- a/hrms/locale/es.po +++ b/hrms/locale/es.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "Añadir permisos no usados de asignaciones anteriores" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Salario anual" @@ -1712,7 +1718,7 @@ msgstr "La fecha de pago de la bonificación no puede ser una fecha pasada" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "Asignación masiva" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "El empleado {0} ya presentó una solicitud {1} para el período de nómina {2}" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "Empleado {0} del medio día del {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "Empleados que trabajan en un día festivo" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "Desde la fecha {0} no puede ser posterior a la fecha de liberación del empleado {1}" @@ -4404,7 +4422,7 @@ msgstr "Desde la fecha {0} no puede ser posterior a la fecha de liberación del msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "Desde la fecha {0} no puede ser anterior a la fecha de incorporación del empleado {1}" @@ -5170,7 +5188,7 @@ msgstr "Deducciones del impuesto sobre la renta" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "Losa de impuesto sobre la renta" msgid "Income Tax Slab Other Charges" msgstr "Impuesto sobre la renta Otros cargos de losa" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "Losa de impuesto sobre la renta debe entrar en vigencia a partir de la fecha de inicio del período de nómina: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "Losa de impuesto sobre la renta no se estableció en la asignación de estructura salarial: {0}" @@ -5200,7 +5218,7 @@ msgstr "Losa de impuesto sobre la renta no se estableció en la asignación de e msgid "Income Tax Slab: " msgstr "Losa de impuesto sobre la renta: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "Losa de impuestos sobre la renta: {0} está inhabilitado" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "Área de Responsabilidad Clave" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "Las vacaciones {0} no se pueden cobrar" msgid "Leave Without Pay" msgstr "Permiso / Vacaciones no remuneradas" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "Las vacaciones no remuneradas no coincide con los registros de {} aprobados" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "Pago Neto no puede ser menor que 0" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "Sin estructura de salario activa o por defecto encontrada de empleado {0} para las fechas indicadas" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "Solo los aprobadores pueden aprobar esta solicitud." @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "Sólo se pueden presentar solicitudes de permiso con el status \"Aprobado\" y \"Rechazado\"." -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "Solo se puede enviar una solicitud de turno con el estado 'Aprobado' y 'Rechazado'" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "Establezca Nómina en función de la configuración de Nómina" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "Por favor establezca la empresa" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "Por favor, establezca la Fecha de Ingreso para el empleado {0}" @@ -8198,7 +8217,7 @@ msgstr "Por favor, comparta sus comentarios con la formación haciendo clic en \ msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "Previsualización de Nómina" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "Nómina del empleado {0} ya creado para este periodo" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "Nómina de sueldo del empleado {0} ya creado para la hoja de tiempo {1}" @@ -9208,7 +9227,7 @@ msgstr "Asignación de Estructura Salarial" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "La asignación de estructura salarial para el empleado ya existe" @@ -9216,7 +9235,7 @@ msgstr "La asignación de estructura salarial para el empleado ya existe" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "Falta estructura salarial" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "Asignación de turno: {0} creado para Empleado: {1}" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "Mostrar vacaciones de todos los miembros del departamento en el calendario" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "Mostrar Nomina Salarial" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "Permiso por enfermedad" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "Asignación única" @@ -10016,7 +10035,7 @@ msgstr "Monto de exención de impuestos estándar" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "Las fechas de inicio y final no están en un Período de cálculo de la nómina válido, no pueden calcular {0}." @@ -10160,7 +10179,8 @@ msgstr "Vista resumida" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,7 @@ msgstr "Impuestos y Beneficios" #. 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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,7 @@ msgstr "Impuesto sobre el Beneficio Flexible" #. 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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "El tiempo antes de la hora de inicio del turno durante el cual se consid msgid "Theory" msgstr "Teoría" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "Existen más vacaciones que días de trabajo en este mes." @@ -10396,7 +10416,7 @@ msgstr "No hay vacantes en el plan de personal {0}" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "Este empleado ya tiene un registro con la misma marca de tiempo. {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "Total de horas de trabajo no deben ser mayores que las horas de trabajo max {0}" @@ -11593,7 +11616,7 @@ msgstr "Usted no está presente todos los días entre los días de solicitud de msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "No puede solicitar su turno predeterminado: {0}" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "{0} debe enviarse" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: No se encontró el correo electrónico de los empleados, por lo tanto, no correo electrónico enviado" diff --git a/hrms/locale/fa.po b/hrms/locale/fa.po index 62638f3842..2460e27d90 100644 --- a/hrms/locale/fa.po +++ b/hrms/locale/fa.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-16 19:12\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "افزودن مرخصی‌های استفاده نشده از تخصیص msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "مرخصی‌های استفاده نشده از تخصیص دوره مرخصی قبلی را به این تخصیص اضافه کنید" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "مؤلفه‌های مالیاتی از Master Component حقوق اضافه شده است زیرا ساختار حقوق و دستمزد هیچ مؤلفه مالیاتی ندارد." @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "درآمد ناخالص سالانه" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "حقوق سالانه" @@ -1712,7 +1718,7 @@ msgstr "تاریخ پرداخت پاداش نمی‌تواند تاریخ گذش msgid "Branch: {0}" msgstr "شعبه: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "اختصاص انبوه" @@ -1814,11 +1820,11 @@ msgstr "نمی‌توان شیفت تخصیص داده شده را لغو کرد msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "نمی‌توان تخصیص شیفت را لغو کرد: {0} زیرا به ثبت ورود کارمند مرتبط است: {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "نمی‌توان فیش حقوقی برای پیوستن کارمندان پس از دوره حقوق و دستمزد ایجاد کرد" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "نمی‌توان فیش حقوقی را برای کارمندی که قبل از دوره حقوق و دستمزد ترک کرده است ایجاد کرد" @@ -2277,7 +2283,7 @@ msgstr "معیارهایی که بر اساس آن کارمند باید در ب msgid "Currency " msgstr " واحد پول" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "واحد پول منتخب مالیات بر درآمد باید به جای {1} {0} باشد." @@ -3405,7 +3411,7 @@ msgstr "کارمند {0} از قبل شیفت فعال {1}: {2} دارد که د msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "کارمند {0} قبلاً یک درخواست {1} برای دوره حقوق و دستمزد {2} ارسال کرده است" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "کارمند {0} قبلاً برای Shift {1}: {2} درخواست داده است که در این دوره همپوشانی دارد" @@ -3433,7 +3439,7 @@ msgstr "کارمند {0} در شرکت کنندگان رویداد آموزشی msgid "Employee {0} on Half day on {1}" msgstr "کارمند {0} در نیم روز در {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "کارمندان بدون هدف: {0}" msgid "Employees working on a holiday" msgstr "کارمندانی که در تعطیلات کار می‌کنند" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "مشارکت کارفرما" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "مشارکت‌های کارفرما" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3632,7 +3649,7 @@ msgstr "مبالغ مزایای سالانه را وارد کنید" #: frontend/src/views/ForgotPassword.vue:22 msgid "Enter your email address and we'll send you a link to reset your password." -msgstr "" +msgstr "آدرس ایمیل خود را وارد کنید، ما لینکی برای بازنشانی گذرواژه برای شما ارسال خواهیم کرد." #: frontend/src/components/FormField.vue:40 #: frontend/src/components/FormField.vue:52 @@ -3651,7 +3668,8 @@ msgstr "خطا در حذف {0}" msgid "Error downloading PDF" msgstr "خطا در دانلود فایل PDF" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "خطا در فرمول یا شرایط" @@ -3667,7 +3685,7 @@ msgstr "خطا در برخی ردیف ها" msgid "Error updating {0}" msgstr "خطا در به‌روزرسانی {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "خطا هنگام ارزیابی {doctype} {doclink} در ردیف {row_id}.

خطا: {خطا}

نکته: {description}" @@ -4080,7 +4098,7 @@ msgstr "" #: frontend/src/views/ForgotPassword.vue:83 msgid "Failed to send reset link" -msgstr "" +msgstr "ارسال لینک بازنشانی ناموفق بود" #: hrms/hr/doctype/interview/interview.py:146 msgid "Failed to send the Interview Reschedule notification. Please configure your email account." @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "از تاریخ {0} نمی‌تواند پس از تاریخ معافیت کارمند {1} باشد" @@ -4404,7 +4422,7 @@ msgstr "از تاریخ {0} نمی‌تواند پس از تاریخ معافی msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "از تاریخ {0} نمی‌تواند قبل از تاریخ پیوستن کارمند {1} باشد" @@ -5170,7 +5188,7 @@ msgstr "کسر مالیات بر درآمد" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "طبقه مالیات بر درآمد" msgid "Income Tax Slab Other Charges" msgstr "سایر هزینه های طبقه مالیات بر درآمد" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "طبقه مالیات بر درآمد باید در تاریخ شروع دوره حقوق و دستمزد یا قبل از آن مؤثر باشد: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "صفحه مالیات بر درآمد در تخصیص ساختار حقوق تنظیم نشده است: {0}" @@ -5200,7 +5218,7 @@ msgstr "صفحه مالیات بر درآمد در تخصیص ساختار حق msgid "Income Tax Slab: " msgstr "طبقه مالیات بر درآمد: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "طبقه مالیات بر درآمد: {0} غیرفعال است" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "تاریخ‌های نامعتبر" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "حوزه مسئولیت کلیدی" msgid "Key Result Area" msgstr "حوزه نتایج کلیدی" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "نوع مرخصی {0} قابل بازخرید نیست" msgid "Leave Without Pay" msgstr "مرخصی بدون حقوق" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "مرخصی بدون حقوق با رکوردهای تأیید شده {} مطابقت ندارد" @@ -6712,11 +6730,11 @@ msgstr "حداقل روزهای تقویمی مورد نیاز از تاریخ msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "از دست رفته تاریخ برکناری" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "طبقه مالیاتی گم شده" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "درخواست‌های من" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "خطای نام" @@ -6829,7 +6848,7 @@ msgstr "پرداخت خالص (ارز شرکت)" msgid "Net Pay Info" msgstr "اطلاعات پرداخت خالص" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "پرداخت خالص نمی‌تواند کمتر از 0 باشد" @@ -6880,7 +6899,7 @@ msgstr "مرخصی‌های جدید اختصاص داده شده (بر حسب #: frontend/src/views/ChangePassword.vue:112 msgid "New passwords do not match" -msgstr "" +msgstr "گذرواژه‌های جدید مطابقت ندارند" #. Description of the 'Create Shifts After' (Date) field in DocType 'Shift #. Schedule Assignment' @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "هیچ ساختار حقوق و دستمزد فعال یا پیش‌فرض برای کارمند {0} برای تاریخ‌های داده شده یافت نشد" @@ -7141,7 +7160,7 @@ msgstr "توجه: شیفت در رکوردهای حضور و غیاب موجود msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "توجه: مجموع مرخصی‌های تخصیص‌یافته {0} نباید کمتر از مرخصی‌های تأیید شده قبلی {1} برای دوره باشد" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "فعالیت‌های آشناسازی" msgid "Onboarding Begins On" msgstr "آشناسازی شروع می‌شود" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "فقط تأیید کنندگان می‌توانند این درخواست را تأیید کنند." @@ -7310,7 +7329,7 @@ msgstr "فقط مصاحبه هایی با وضعیت پاک شده یا رد ش msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "فقط برنامه‌های کاربردی با وضعیت \"تأیید شده\" و \"رد شده\" قابل ارسال هستند" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "فقط درخواست Shift با وضعیت \"تأیید\" و \"رد شده\" قابل ارسال است" @@ -7404,7 +7423,7 @@ msgstr "درخواست حضور و غیاب همپوشانی" msgid "Overlapping Shift Attendance" msgstr "حضور و غیاب شیفت همپوشانی" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "درخواست‌های شیفت همپوشانی" @@ -7610,7 +7629,7 @@ msgstr "خط مشی گذرواژه برای فیش حقوقی تنظیم نشد #: frontend/src/views/ForgotPassword.vue:74 msgid "Password reset link has been sent to your email." -msgstr "" +msgstr "لینک بازنشانی گذرواژه به ایمیل شما ارسال شد." #. Label of the pay_details_tab (Tab Break) field in DocType 'Job Opening' #. Label of the pay_details_section (Section Break) field in DocType 'Job @@ -7928,7 +7947,7 @@ msgstr "لطفاً حضور و غیاب خودکار را فعال کنید و msgid "Please Select Company First" msgstr "لطفا ابتدا شرکت را انتخاب کنید" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "لطفاً ابتدا یک ساختار حقوق و دستمزد برای کارمند {0} اختصاص دهید که از {1} یا قبل از آن اعمال می‌شود." @@ -7958,11 +7977,11 @@ msgstr "لطفا نقش سازمانی را وارد کنید" #: frontend/src/views/ForgotPassword.vue:104 msgid "Please enter your email address" -msgstr "" +msgstr "لطفا آدرس ایمیل خود را وارد کنید" #: frontend/src/views/ChangePassword.vue:107 msgid "Please fill all fields" -msgstr "" +msgstr "لطفا همه فیلدها را پر کنید" #: hrms/hr/doctype/overtime_slip/overtime_slip.js:11 msgid "Please fill in Employee, Posting Date, and Company before fetching overtime details." @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "لطفا پیوست را ببینید" @@ -8099,7 +8118,7 @@ msgstr "لطفاً مؤلفه درآمد را برای نوع مرخصی تنظ msgid "Please set Leave Approver for the Employee: {0}" msgstr "لطفا تاییدکننده مرخصی را برای کارمند تنظیم کنید: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "لطفاً حقوق و دستمزد را بر اساس تنظیمات حقوق و دستمزد تنظیم کنید" @@ -8144,7 +8163,7 @@ msgstr "لطفاً الگوی ارزیابی را برای همه {0} تنظیم msgid "Please set the Company" msgstr "لطفا شرکت را تنظیم کنید" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "لطفاً تاریخ عضویت را برای کارمند تعیین کنید {0}" @@ -8198,7 +8217,7 @@ msgstr "لطفاً با کلیک بر روی \"بازخورد آموزشی\" و msgid "Please specify the job applicant to be updated." msgstr "لطفا متقاضی کار را مشخص کنید تا به روز شود." -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "لطفاً {0} و {1} (در صورت وجود) را برای محاسبه صحیح مالیات در فیش های حقوقی آینده مشخص کنید." @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "جلوگیری از خود تأییدی درخواست‌های مرخصی حتی اگر کاربر مجوز داشته باشد" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "پیش‌نمایش فیش حقوقی" @@ -9131,11 +9150,11 @@ msgstr "ایجاد فیش حقوقی در صف است. ممکن است چند د msgid "Salary Slip not found." msgstr "فیش حقوقی پیدا نشد." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "فیش حقوق کارمند {0} قبلاً برای این دوره ایجاد شده است" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "فیش حقوق کارمند {0} قبلاً برای برگه زمانی {1} ایجاد شده است" @@ -9208,7 +9227,7 @@ msgstr "تخصیص ساختار حقوق و دستمزد" msgid "Salary Structure Assignment field" msgstr "فیلد تخصیص ساختار حقوق و دستمزد" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "تخصیص ساختار حقوق و دستمزد برای کارمند از قبل وجود دارد" @@ -9216,7 +9235,7 @@ msgstr "تخصیص ساختار حقوق و دستمزد برای کارمند msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "ساختار حقوق و دستمزد وجود ندارد" @@ -9228,7 +9247,7 @@ msgstr "ساختار حقوق باید قبل از ارسال {0} ارسال ش msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "ساختار حقوق و دستمزد {0} متعلق به شرکت {1} نیست" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "مؤلفه‌های حقوق باید بخشی از ساختار حقوق و دستمزد باشد." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "ایمیل های فیش حقوقی برای ارسال در نوبت قرار گرفته اند. وضعیت {0} را بررسی کنید." @@ -9514,7 +9533,7 @@ msgstr "ارسال اعلان مرخصی" #: frontend/src/views/ForgotPassword.vue:45 msgid "Send Reset Link" -msgstr "" +msgstr "ارسال لینک بازنشانی" #. Label of the sender_copy (Link) field in DocType 'Payroll Settings' #: hrms/payroll/doctype/payroll_settings/payroll_settings.json @@ -9687,7 +9706,7 @@ msgstr "تاریخچه تخصیص شیفت" msgid "Shift Assignment Tool" msgstr "ابزار تخصیص شیفت" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "تخصیص شیفت: {0} برای کارمند ایجاد شد: {1}" @@ -9895,7 +9914,7 @@ msgstr "نمایش تراز مرخصی در فیش حقوقی" msgid "Show Leaves Of All Department Members In Calendar" msgstr "نمایش مرخصی‌های همه اعضای بخش در تقویم" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "نمایش فیش حقوقی" @@ -9907,7 +9926,7 @@ msgstr "در حال نمایش" msgid "Sick Leave" msgstr "مرخصی استعلاجی" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "اختصاص تکی" @@ -10016,7 +10035,7 @@ msgstr "مبلغ استاندارد معافیت مالیاتی" msgid "Standard Working Hours" msgstr "ساعت کاری استاندارد" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "تاریخ شروع و پایان در یک دوره حقوق و دستمزد معتبر نیست، نمی‌تواند {0} را محاسبه کند." @@ -10160,7 +10179,8 @@ msgstr "نمای خلاصه شده" msgid "Sync {0}" msgstr "همگام سازی {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "اشتباه نوشتاری" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "مالیات کسر شده تا تاریخ" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "درآمد مشمول مالیات تا تاریخ" @@ -10378,7 +10398,7 @@ msgstr "زمان قبل از زمان شروع شیفت که طی آن ورود msgid "Theory" msgstr "تئوری" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "تعداد روزهای تعطیل در این ماه بیشتر از روزهای کاری است." @@ -10396,7 +10416,7 @@ msgstr "هیچ جای خالی در طرح کارگزینی وجود ندارد #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "این مرخصی جبرانی از {0} قابل اجرا خواهد ب msgid "This employee already has a log with the same timestamp.{0}" msgstr "این کارمند قبلاً یک لاگ با همان مهر زمانی دارد.{0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "این خطا می‌تواند به دلیل فرمول یا شرایط نامعتبر باشد." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "این خطا می‌تواند به دلیل نحو نامعتبر باشد." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "این خطا می‌تواند به دلیل گم شدن یا حذف شدن فیلد باشد." @@ -10889,7 +10912,7 @@ msgstr "مجموع وزن‌ها برای همه {0} باید به ۱۰۰ برس msgid "Total working Days Per Year" msgstr "مجموع روزهای کاری در سال" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "مجموع ساعات کاری نباید از حداکثر ساعات کاری بیشتر باشد {0}" @@ -11593,7 +11616,7 @@ msgstr "شما در تمام روز(های) بین روزهای درخواست msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "اگر طبقه بدون محدودیت‌های پایین و بالایی داشته باشید، نمی‌توانید چند طبقه را تعریف کنید." -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "شما نمی‌توانید برای شیفت پیش‌فرض خود درخواست دهید: {0}" @@ -11613,6 +11636,10 @@ msgstr "شما فقط می‌توانید اسناد JPG، PNG، PDF، TXT یا msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "شما اجازه تغییر وضعیت درخواست شیفت را ندارید." + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11664,7 +11691,7 @@ msgstr "جلسه مصاحبه شما از {0} {1} - {2} به {3} {4} - {5} تغ #: frontend/src/views/ChangePassword.vue:85 msgid "Your password has been updated." -msgstr "" +msgstr "گذرواژه شما به‌روزرسانی شد." #: frontend/src/views/Login.vue:22 msgid "Your password has expired. Please reset your password to continue" @@ -11789,7 +11816,7 @@ msgstr "{0} وجود ندارد" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} ردیف #{1}: فرمول تنظیم شده است اما {2} برای مؤلفه حقوق و دستمزد {3} غیرفعال است." -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} ردیف #{1}: برای در نظر گرفتن فرمول باید {2} فعال شود." @@ -11876,7 +11903,7 @@ msgstr "{0} مرخصی به‌صورت دستی توسط {1} در {2} تخصیص msgid "{0} must be submitted" msgstr "{0} باید ارسال شود" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} از {1} تکمیل شد" @@ -11912,7 +11939,7 @@ msgstr "{0} {1} {2}؟" msgid "{0}. Check error log for more details." msgstr "{0}. برای جزئیات بیشتر، لاگ خطا را بررسی کنید." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: ایمیل کارمند یافت نشد، بنابراین ایمیل ارسال نشد" diff --git a/hrms/locale/fr.po b/hrms/locale/fr.po index 620d4b04ef..edd27f2a45 100644 --- a/hrms/locale/fr.po +++ b/hrms/locale/fr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:40\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: French\n" "MIME-Version: 1.0\n" @@ -525,7 +525,7 @@ msgstr "Ajouter les congés inutilisés des précédentes allocations" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "Ajouter les congés non utilisés de l'attribution de la période de congé précédente à cette attribution" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "Ajout de composantes fiscales provenant du maître de la composante salariale car la structure salariale n'avait aucune composante fiscale." @@ -872,6 +872,12 @@ msgstr "Allocation annuelle dépassée" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Salaire annuel" @@ -1737,7 +1743,7 @@ msgstr "La date de paiement du bonus ne peut pas être une date passée" msgid "Branch: {0}" msgstr "Branche : {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "Affectations groupées" @@ -1839,11 +1845,11 @@ msgstr "Impossible d'annuler l'affectation de shift {0} car elle est liée à la msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "Impossible d'annuler l'affectation de shift {0} car elle est liée au pointage de l'employé : {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "Impossible de créer un bulletin de salaire pour les employés qui se joignent après la période de paie" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "Impossible de créer un bulletin de salaire pour l'employé qui est parti avant la période de paie" @@ -2305,7 +2311,7 @@ msgstr "Critères sur la base desquels l'employé doit être évalué dans la r msgid "Currency " msgstr "Devise " -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "La devise de la tranche d'imposition sélectionnée doit être {0} au lieu de {1}" @@ -3433,7 +3439,7 @@ msgstr "L'employé {0} a déjà un décalage d'activité {1}: {2} qui se chevauc msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "L'employé {0} a déjà soumis une demande {1} pour la période de paie {2}" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "L'employé {0} a déjà une demande de shift {1} : {2} qui se chevauche sur cette période" @@ -3461,7 +3467,7 @@ msgstr "Employé {0} introuvable dans l'événement de formation." msgid "Employee {0} on Half day on {1}" msgstr "Employé {0} sur une demi-journée sur {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "L'employé {0} relevé le {1} doit être défini comme « Parti »" @@ -3526,6 +3532,17 @@ msgstr "Employés sans objectifs: {0}" msgid "Employees working on a holiday" msgstr "Employés qui travaillent un jour férié" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3679,7 +3696,8 @@ msgstr "Erreur lors de la suppression de {0}" msgid "Error downloading PDF" msgstr "Erreur lors du téléchargement du PDF" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "Erreur dans la formule ou la condition" @@ -3695,7 +3713,7 @@ msgstr "Erreur dans certaines lignes" msgid "Error updating {0}" msgstr "Erreur lors de la mise à jour de {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "Erreur lors de l'évaluation de l' {doctype} {doclink} à la ligne {row_id}.

Erreur : {error}

Indice : {description}" @@ -4424,7 +4442,7 @@ msgstr "La date de début doit être antérieure à la date de fin" msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "La date de début {0} ne peut pas être postérieure à la date de fin de la période de paie {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "La date de début {0} ne peut pas être après la date de départ de l'employé {1}" @@ -4432,7 +4450,7 @@ msgstr "La date de début {0} ne peut pas être après la date de départ de l'e msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "La date de début {0} ne peut pas être antérieure à la date de début de la période de paie {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "La date de départ {0} ne peut pas être antérieure à la date d'arrivée de l'employé {1}" @@ -5198,7 +5216,7 @@ msgstr "Déductions d'impôt sur le revenu" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5212,15 +5230,15 @@ msgstr "Tranche d'imposition" msgid "Income Tax Slab Other Charges" msgstr "Autres charges de la tranche d'imposition" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "La tranche d'imposition est obligatoire car la structure salariale {0} comporte une composante fiscale {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "La tranche d'imposition doit être en vigueur à la date de début de la période de paie ou avant : {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "Tranche d'imposition non définie dans l'affectation de la structure salariale : {0}" @@ -5228,7 +5246,7 @@ msgstr "Tranche d'imposition non définie dans l'affectation de la structure sal msgid "Income Tax Slab: " msgstr "Tranche d'imposition: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "Tranche d'imposition : {0} est désactivée" @@ -5464,7 +5482,7 @@ msgstr "Montants d'avantage invalides" msgid "Invalid Dates" msgstr "Dates invalides" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "Nombre de jours ASP à inverser invalide" @@ -5836,7 +5854,7 @@ msgstr "Domaine de responsabilités principal" msgid "Key Result Area" msgstr "Zone de résultat clé" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "Le nombre de jours ASP inversés ({0}) ne correspond pas au total des corrections de paie ({1}) pour l'employé {2} du {3} au {4}" @@ -6253,7 +6271,7 @@ msgstr "Le type de congé {0} n'est pas encaissable" msgid "Leave Without Pay" msgstr "Congé Sans Solde" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "Le congé sans solde ne correspond pas aux enregistrements {} approuvés" @@ -6740,11 +6758,11 @@ msgstr "Nombre minimal de jours calendaires requis depuis la date d'entrée pour msgid "Missing Advance Account" msgstr "Compte d'avance manquant" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "Champ obligatoire manquant" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "Écritures d'ouverture manquantes" @@ -6756,7 +6774,7 @@ msgstr "Date de départ manquante" msgid "Missing Salary Components" msgstr "Composantes salariales manquantes" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "Tranche fiscale manquante" @@ -6829,7 +6847,8 @@ msgid "My Requests" msgstr "Mes demandes" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "Erreur de nom" @@ -6857,7 +6876,7 @@ msgstr "Salaire net (devise de l'entreprise)" msgid "Net Pay Info" msgstr "Infos salariales nettes" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "Salaire Net ne peut pas être inférieur à 0" @@ -6988,7 +7007,7 @@ msgstr "Aucune affectation de structure salariale active trouvée pour l'employ 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 "Aucun employé actif trouvé associé à l'adresse e-mail {0}. Essayez de vous connecter avec votre adresse e-mail employé ou contactez votre responsable RH." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "Aucune structure de salaire active ou par défaut trouvée pour l'employé {0} pour les dates données" @@ -7169,7 +7188,7 @@ msgstr "Remarque : Maj ne sera pas écrasé dans les dossiers de présence exist msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "Remarque : Le total des congés attribués {0} ne devrait pas être inférieur aux congés déjà approuvés {1} pour la période" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "Remarque : Votre bulletin de salaire est protégé par un mot de passe, le mot de passe pour déverrouiller le PDF est au format {0}." @@ -7314,7 +7333,7 @@ msgstr "Activités d'intégration" msgid "Onboarding Begins On" msgstr "L'intégration commence le" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "Seuls les approbateurs peuvent approuver cette demande." @@ -7338,7 +7357,7 @@ msgstr "Seules les entrevues avec statut effacé ou rejeté peuvent être envoy msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "Seules les demandes de congés avec le statut 'Approuvée' ou 'Rejetée' peuvent être soumises" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "Seules les demandes de shift avec le statut « Approuvé » et « Rejeté » peuvent être soumises" @@ -7432,7 +7451,7 @@ msgstr "Requête de présence chevauchée" msgid "Overlapping Shift Attendance" msgstr "Présence du chevauchement" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "Demandes de shift en conflit" @@ -7956,7 +7975,7 @@ msgstr "Veuillez activer la participation automatique et terminer la configurati msgid "Please Select Company First" msgstr "Veuillez d'abord sélectionner la société" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "Veuillez assigner une structure de salaire pour l'employé {0} applicable à partir ou avant {1} en premier" @@ -8000,7 +8019,7 @@ msgstr "Veuillez renseigner l'employé, la date de comptabilisation et la socié msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "Veuillez réduire {0} pour éviter le chevauchement des horaires de shift" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "Veuillez consulter la pièce jointe" @@ -8127,7 +8146,7 @@ msgstr "Veuillez définir le composant de gain pour le type de congé : {0}." msgid "Please set Leave Approver for the Employee: {0}" msgstr "Veuillez définir un approbateur de congés pour l'employé : {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "Veuillez définir la paie en fonction des paramètres de paie" @@ -8172,7 +8191,7 @@ msgstr "Veuillez définir le modèle d'évaluation de l' {0} ou sélectionnez le msgid "Please set the Company" msgstr "Veuillez définir la société" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "Veuillez définir la date d'embauche pour l'employé {0}" @@ -8226,7 +8245,7 @@ msgstr "Partagez vos commentaires sur la formation en cliquant sur 'Retour d'Exp msgid "Please specify the job applicant to be updated." msgstr "Veuillez indiquer le candidat au poste à mettre à jour." -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "Veuillez préciser {0} et {1} (le cas échéant) pour un calcul fiscal correct dans les futurs bulletins de salaire." @@ -8284,8 +8303,8 @@ msgstr "Empêcher l'auto-approbation des notes de frais même si l'utilisateur e msgid "Prevent self approval for leaves even if user has permissions" msgstr "Empêcher l'auto-approbation des congés même si l'utilisateur en a la permission" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "Aperçu du bulletin de salaire" @@ -9159,11 +9178,11 @@ msgstr "La création du bulletin de salaire est en file d'attente. Cela peut pre msgid "Salary Slip not found." msgstr "Bulletin de salaire introuvable." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "Bulletin de salaire de l'employé {0} déjà créé pour cette période" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "Bulletin de salaire de l'employé {0} déjà créé pour la feuille de temps {1}" @@ -9236,7 +9255,7 @@ msgstr "Attribution de la structure salariale" msgid "Salary Structure Assignment field" msgstr "Champ d'affectation de structure salariale" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "La structure de la structure salariale pour l'employé existe déjà" @@ -9244,7 +9263,7 @@ msgstr "La structure de la structure salariale pour l'employé existe déjà" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "Affectation de structure salariale introuvable pour l'employé {0} à la date {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "Grille des salaires manquante" @@ -9256,7 +9275,7 @@ msgstr "La structure salariale doit être soumise avant la soumission de {0}" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "Aucune structure salariale affectée à l'employé {0} pour la date {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "La structure de salaire {0} n'appartient pas à la société {1}" @@ -9310,7 +9329,7 @@ msgstr "Les composantes salariales de type Fonds de prévoyance, Fonds de prévo msgid "Salary components should be part of the Salary Structure." msgstr "Les composantes salariales doivent faire partie de la structure salariale." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "Les e-mails de bulletin de salaire ont été mis en file d'attente pour l'envoi. Vérifiez {0} pour le statut." @@ -9715,7 +9734,7 @@ msgstr "Historique des affectations de shift" msgid "Shift Assignment Tool" msgstr "Affectation de planning des quarts en blocs" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "Affectation d'équipe: {0} créée pour l'employé: {1}" @@ -9923,7 +9942,7 @@ msgstr "Afficher les soldes de congés dans le bulletin de salaire" msgid "Show Leaves Of All Department Members In Calendar" msgstr "Afficher les congés de tous les membres du département dans le calendrier" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "Afficher le bulletin de salaire" @@ -9935,7 +9954,7 @@ msgstr "Affichage en cours" msgid "Sick Leave" msgstr "Congé Maladie" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "Affectation unique" @@ -10044,7 +10063,7 @@ msgstr "Montant de l'exemption fiscale standard" msgid "Standard Working Hours" msgstr "Heures de travail standard" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "Les dates de début et de fin ne figurant pas dans une période de paie valide, le système ne peut pas calculer {0}." @@ -10188,7 +10207,8 @@ msgstr "Vue résumée" msgid "Sync {0}" msgstr "Synchroniser {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "Erreur de syntaxe" @@ -10214,7 +10234,7 @@ msgstr "Taxes et avantages fiscaux" #. 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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "Date de déduction fiscale jusqu'à la date" @@ -10259,7 +10279,7 @@ msgstr "Impôt sur les prestations sociales variables" #. 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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "Gains imposables jusqu'à la date" @@ -10406,7 +10426,7 @@ msgstr "Heure avant l'heure de début du quart pendant laquelle l'enregistrement msgid "Theory" msgstr "Théorie" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "Il y a plus de vacances que de jours travaillés ce mois-ci." @@ -10424,7 +10444,7 @@ msgstr "Il n'y a pas de postes vacants dans le plan de dotation en personnel {0} #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "Aucune structure salariale n'est affectée à {0}. Veuillez d'abord affecter une structure salariale." @@ -10454,15 +10474,18 @@ msgstr "Ce congé compensatoire sera applicable à partir de {0}." msgid "This employee already has a log with the same timestamp.{0}" msgstr "Cet employé a déjà un journal avec le même horodatage. {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "Cette erreur peut être due à une formule ou une condition non valide." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "Cette erreur peut être due à une syntaxe invalide." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "Cette erreur peut être due à un champ manquant ou supprimé." @@ -10917,7 +10940,7 @@ msgstr "Le poids total pour tout l' {0} doit s'élever à 100. Actuellement, il msgid "Total working Days Per Year" msgstr "Nombre de jours de travail par année" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "Le nombre total d'heures travaillées ne doit pas être supérieur à la durée maximale du travail {0}" @@ -11621,7 +11644,7 @@ msgstr "Vous n'êtes pas présent(e) tous les jours vos demandes de congé compe msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "Vous ne pouvez pas définir plusieurs tranches si vous avez une tranche sans limite inférieure et supérieure." -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "Vous ne pouvez pas demander votre quart de travail par défaut: {0}" @@ -11641,6 +11664,10 @@ msgstr "Vous ne pouvez télécharger que des documents JPG, PNG, PDF, TXT ou Mic msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "Vous ne pouvez pas inverser plus que le total des jours ASP {0}. Vous avez déjà inversé {1} jours pour cet employé." +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11817,7 +11844,7 @@ msgstr "{0} manquant" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} Ligne #{1}: La formule est définie mais {2} est désactivée pour le composant de salaire {3}." -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} Ligne #{1}: {2} doit être activé pour que la formule soit considérée." @@ -11904,7 +11931,7 @@ msgstr "{0} congé(s) ont été alloués manuellement par {1} le {2}" msgid "{0} must be submitted" msgstr "{0} doit être soumis" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} de {1} terminé" @@ -11940,7 +11967,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "{0}. Consultez le journal des erreurs pour plus de détails." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0} : Adresse email de l'employé introuvable : l’email n'a pas été envoyé" diff --git a/hrms/locale/hi.po b/hrms/locale/hi.po index c1f2d1efc2..36a5f6fb4d 100644 --- a/hrms/locale/hi.po +++ b/hrms/locale/hi.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-14 16:55\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:55\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Hindi\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "वार्षिक वेतन" @@ -1712,7 +1718,7 @@ msgstr "" msgid "Branch: {0}" msgstr "शाखा: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "मुद्रा " -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "कर्मचारी {0} ने {1} को आधे दिन काम किया" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "छुट्टी के दिन काम करने वाले कर्मचारी" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4404,7 +4422,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5170,7 +5188,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5200,7 +5218,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5436,7 +5454,7 @@ msgstr "अमान्य लाभ राशि" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "मुख्य उत्तरदायित्व क्षेत् msgid "Key Result Area" msgstr "मुख्य परिणाम क्षेत्र" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "बिना वेतन के छुट्टी" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "अग्रिम खाते का पता नहीं" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "वेतन के लापता घटक" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "मेरा अनुभव" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "शुद्ध वेतन (कंपनी की मुद्रा msgid "Net Pay Info" msgstr "शुद्ध वेतन जानकारी" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "कृपया पहले कंपनी का चयन करें" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "कृपया कंपनी का नाम सेट करें" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8198,7 +8217,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9208,7 +9227,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "कर्मचारी के लिए वेतन संरचना निर्धारण पहले से मौजूद है" @@ -9216,7 +9235,7 @@ msgstr "कर्मचारी के लिए वेतन संरचन msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "वेतन संरचना उपलब्ध नहीं है" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "वेतन संरचना {0} कंपनी {1} से संबंधित नहीं है" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9907,7 +9926,7 @@ msgstr "दिखा" msgid "Sick Leave" msgstr "बीमारी के लिए अवकाश" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "मानक कर छूट राशि" msgid "Standard Working Hours" msgstr "मानक कार्य घंटे" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10160,7 +10179,8 @@ msgstr "संक्षिप्त दृश्य" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "आज तक की कर योग्य आय" @@ -10378,7 +10398,7 @@ msgstr "" msgid "Theory" msgstr "लिखित" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10396,7 +10416,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "प्रति वर्ष कुल कार्य दिवस" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "कुल कार्य घंटे अधिकतम कार्य घंटों से अधिक नहीं होने चाहिए {0}" @@ -11593,7 +11616,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "{0} जमा करना होगा" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} में से {1} पूर्ण हो गया" @@ -11912,7 +11939,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: कर्मचारी का ईमेल पता नहीं चला, इसलिए ईमेल नहीं भेजा गया" diff --git a/hrms/locale/hr.po b/hrms/locale/hr.po index 5e820ba6c8..149cdec04b 100644 --- a/hrms/locale/hr.po +++ b/hrms/locale/hr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-09 15:37\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:55\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Croatian\n" "MIME-Version: 1.0\n" @@ -525,7 +525,7 @@ msgstr "Dodajte neiskorištene praznike iz prethodnih dodjela" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "Dodajte neiskorištene praznike iz dodjela prethodnog perioda praznika u ovu dodjelu" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "Dodane komponente poreza iz Postavki Komponente Plate jer struktura plata nije imala nikakvu poresku komponentu." @@ -872,6 +872,12 @@ msgstr "Godišnja Dodjela je premašena" msgid "Annual CTC" msgstr "Godišnja Plaća" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "Godišnja Bruto Zarada" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Godišnja Plata" @@ -1737,7 +1743,7 @@ msgstr "Datum Uplate Bonusa ne može biti prošli datum" msgid "Branch: {0}" msgstr "Grana: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "Masovna Dodjela" @@ -1839,11 +1845,11 @@ msgstr "Nije moguće otkazati Dodjelu Smjene: {0} jer je povezana sa Prisustvom: msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "Nije moguće otkazati Dodjelu Smjenae {0} jer je povezano sa Prijavom Personala: {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "Ne može se kreirati Platni List za pridruživanje personala nakon Obračunskog Perioda" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "Ne može se kreirati Platni List za personal otpušten prije Obračunskog Perioda" @@ -2305,7 +2311,7 @@ msgstr "Kriterijum na osnovu kojeg personal treba procijeniti u Povratnim Inform msgid "Currency " msgstr "Valuta " -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "Valuta odabrane Tabele Poreza na Platu bi trebala biti {0} umjesto {1}" @@ -3433,7 +3439,7 @@ msgstr "{0} već ima aktivnu smjenu {1}: {2} koja se preklapa u ovom periodu." msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "{0} je već predao zahtjev {1} za period obračuna plata {2}" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "{0} se već prijavio za smjenu {1}: {2} koja se preklapa u ovom periodu" @@ -3461,7 +3467,7 @@ msgstr "{0} nije pronađen među učesnicima obuke." msgid "Employee {0} on Half day on {1}" msgstr "{0} na pola dana {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "{0} razriješen {1} mora biti postavljen kao 'Napustio'" @@ -3526,6 +3532,17 @@ msgstr "Personal bez Ciljeva: {0}" msgid "Employees working on a holiday" msgstr "Praznični Personal" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "Doprinos Poslodavca" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "Doprinosi Poslodavca" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3679,7 +3696,8 @@ msgstr "Greška pri brisanju {0}" msgid "Error downloading PDF" msgstr "Pogreška pri preuzimanju PDF-a" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "Greška u formuli ili stanju" @@ -3695,7 +3713,7 @@ msgstr "Greška u nekim redovima" msgid "Error updating {0}" msgstr "Greška pri ažuriranju {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "Greška prilikom procjene {doctype} {doclink} u redu {row_id}.

Greška: {error}

Savjet: {description}" @@ -4424,7 +4442,7 @@ msgstr "Od datuma mora biti prije Do datuma" msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "Datum od {0} ne može biti nakon datuma završetka razdoblja obračuna plaća {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "Od datuma {0} ne može biti nakon datuma razrješenja {1}" @@ -4432,7 +4450,7 @@ msgstr "Od datuma {0} ne može biti nakon datuma razrješenja {1}" msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "Datum od {0} ne može biti prije datuma početka razdoblja obračuna plaća {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "Od datuma {0} ne može biti prije datuma zapošljenja {1}" @@ -5198,7 +5216,7 @@ msgstr "Odbici Poreza na Platu" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5212,15 +5230,15 @@ msgstr "Tablica Poreza na Platu" msgid "Income Tax Slab Other Charges" msgstr "Tabela Porez na Platu Ostale Naknade" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "Tabela Poreza na Platu je obavezna jer Struktura Plate {0} ima poresku komponentu {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "Tabela Poreza na Platu mora biti na snazi na ili prije datuma početka obračunskog perioda: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "Tabela Poreza na Platu nije postavljena u Dodjeli Strukture Plata: {0}" @@ -5228,7 +5246,7 @@ msgstr "Tabela Poreza na Platu nije postavljena u Dodjeli Strukture Plata: {0}" msgid "Income Tax Slab: " msgstr "Tablica Poreza na Plaću: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "Tabela Poreza na Platu: {0} je onemogućena" @@ -5464,7 +5482,7 @@ msgstr "Nevažeći Iznosi Pogodnosti" msgid "Invalid Dates" msgstr "Nevažeći Datumi" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "Nevažeći neplačeni dani su poništeni" @@ -5836,7 +5854,7 @@ msgstr "Ključno Polje Odgovornosti" msgid "Key Result Area" msgstr "Ključno Polje Rezultata" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "Necažeči neplaćeni dani ({0}) ne odgovaraju stvarnom ukupnom iznosu ispravaka plaća ({1}) za {2} od {3} do {4}" @@ -6253,7 +6271,7 @@ msgstr "Tip Odsutva {0} nije moguće unovčiti" msgid "Leave Without Pay" msgstr "Neplaćeno Odsustvo" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "Neplaćeno Odsustvo ne odgovara odobrenim {} zapisima" @@ -6740,11 +6758,11 @@ msgstr "Minimalni broj kalendarskih dana obaveznih od datuma pridruživanja da b msgid "Missing Advance Account" msgstr "Nedostaje Račun Predujma" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "Nedostaje Obavezno Polje" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "Nedostaju Početni Unosi" @@ -6756,7 +6774,7 @@ msgstr "Nedostaje Datum Otkaza" msgid "Missing Salary Components" msgstr "Nedostaju Komponente Plaće" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "Nedostaje Porezna Tabela" @@ -6829,7 +6847,8 @@ msgid "My Requests" msgstr "Moji Zahtjevi" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "Greška Imena" @@ -6857,7 +6876,7 @@ msgstr "Neto Plata (Valuta Tvrtke)" msgid "Net Pay Info" msgstr "Neto Plata" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "Neto Plata ne može biti manja od 0" @@ -6988,7 +7007,7 @@ msgstr "Nije pronađena aktivna dodjela strukture plaća za {0} sa strukturom pl 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 "Nije pronađen aktivni personal povezan s ID-om e-pošte {0}. Pokušaj se prijaviti sa svojim ID-om e-pošte ili se obratite svom personalnom upravitelju za pristup." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "Nije pronađena aktivna ili standard struktura plata za personal {0} za date datume" @@ -7169,7 +7188,7 @@ msgstr "Napomena: Smjena neće biti prepisana u postojećem zapisu prisutnosti" msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "Napomena: Ukupan broj dodijeljenog odsustva {0} ne bi trebao biti manji od već odobrenog odsustva {1} za period" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "Napomena: Vaš platni list je zaštićen lozinkom, lozinka za otključavanje PDF-a je formata {0}." @@ -7314,7 +7333,7 @@ msgstr "Aktivnosti Introdukcije" msgid "Onboarding Begins On" msgstr "Introdukcija Počinje" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "Samo Odobravatelji mogu odobriti ovaj zahtjev." @@ -7338,7 +7357,7 @@ msgstr "Samo Intervjui sa statusom \"Obrađen\" ili \"Odbijen\" mogu se podnijet msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "Samo Zahtjevi Odsustva sa statusom \"Odobren\" i \"Odbijen\" mogu se podnijeti" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "Samo Zahtjev Smjene sa statusom \"Odobren\" i \"Odbijen\" može se podnijeti" @@ -7432,7 +7451,7 @@ msgstr "Preklapajući Zahtjev za Prisustvo" msgid "Overlapping Shift Attendance" msgstr "Preklapajuće Prisustvo Smjene" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "Preklapajući Zahtjevi za Smjenu" @@ -7956,7 +7975,7 @@ msgstr "Omogući Automatsko Prisustvo i prvo dovršite podešavanje." msgid "Please Select Company First" msgstr "Odaberi Tvrtku" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "Dodijeli Strukturu Plata za {0} primjenjivu od ili prije {1}" @@ -8000,7 +8019,7 @@ msgstr "Ispuni podatke za zaposlenike, datum registracije i tvrtku prije preuzim msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "Smanji {0} kako biste izbjegli preklapanje vremena smjene sa samom sobom" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "Pogledaj Prilog" @@ -8127,7 +8146,7 @@ msgstr "Postavi komponentu Zarade za Tip Odsustva: {0}." msgid "Please set Leave Approver for the Employee: {0}" msgstr "Postavi Odobravatelja Odsustva za: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "Postavi Obračun Plata na osnovu Postavki Obračuna Plata" @@ -8172,7 +8191,7 @@ msgstr "Postavi Predložak Ocjenjivanja za sve {0} ili odaberi predložak u tabe msgid "Please set the Company" msgstr "Postavi Tvrtku" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "Postavi Datum zapošljavanja za {0}" @@ -8226,7 +8245,7 @@ msgstr "Podijeli Povratne Informacije obuke klikom na 'Povratne Informacije Obuk msgid "Please specify the job applicant to be updated." msgstr "Navedi kandidata za posao kojeg treba ažurirati." -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "Navedi {0} i {1} (ako ih ima), za tačan obračun poreza u budućim platnim listovima." @@ -8284,8 +8303,8 @@ msgstr "Spriječite samoodobrenje za zahtjeve za troškove čak i ako korisnik i msgid "Prevent self approval for leaves even if user has permissions" msgstr "Spriječi samoodobrenje za odsustvo čak i ako korisnik ima dozvole" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "Pregled Platnog Lista" @@ -9159,11 +9178,11 @@ msgstr "Kreiranje Platnog Lista je u redu čekanja. Može potrajati nekoliko min msgid "Salary Slip not found." msgstr "Platna Lista nije pronađena." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "Platni List {0} je već kreiran za ovaj period" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "Platni List {0} je već kreiran za radni list {1}" @@ -9236,7 +9255,7 @@ msgstr "Dodjela Strukture Plaća" msgid "Salary Structure Assignment field" msgstr "Polje Dodjele Strukture Plate" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "Struktura Plate za Personal već postoji" @@ -9244,7 +9263,7 @@ msgstr "Struktura Plate za Personal već postoji" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "Dodjeljivanje strukture plaća nije pronađeno za {0} na datum {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "Nedostaje Struktura Plate" @@ -9256,7 +9275,7 @@ msgstr "Struktura Plate mora biti dostavljena prije podnošenja {0}" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "Struktura plaća nije dodijeljena {0} za datum {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "Struktura Plate {0} ne pripada tvrtki {1}" @@ -9310,7 +9329,7 @@ msgstr "Komponente plaće tipa Provident fond, Dodatni Provident fond ili Zajam msgid "Salary components should be part of the Salary Structure." msgstr "Komponente Plate trebaju biti dio Strukture Plate." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "Slanje Platnih Listi e-poštom stavljeni su u red za slanje. Provjerite {0} za status." @@ -9715,7 +9734,7 @@ msgstr "Istorija Dodjele Smjene" msgid "Shift Assignment Tool" msgstr "Alat Dodjele Smjene" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "Dodjela Smjene: {0} kreirana za personal: {1}" @@ -9923,7 +9942,7 @@ msgstr "Prikaži Stanje Odsustva u Platnom Listu" msgid "Show Leaves Of All Department Members In Calendar" msgstr "Prikaži odsustvo svih Članova Odjela u Kalendaru" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "Prikaži Platni List" @@ -9935,7 +9954,7 @@ msgstr "Trenutno se prikazuje" msgid "Sick Leave" msgstr "Bolovanje" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "Pojedinačna Dodjela" @@ -10044,7 +10063,7 @@ msgstr "Standardni Iznos Izuzeća od Poreza" msgid "Standard Working Hours" msgstr "Standardno Radno Vrijeme" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "Datum početka i završetka nije u važećem obračunskom periodu, ne može se izračunati {0}." @@ -10188,7 +10207,8 @@ msgstr "Sažeti Prikaz" msgid "Sync {0}" msgstr "Sinhronizuj {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "Sintaksička greška" @@ -10214,7 +10234,7 @@ msgstr "Porez&Beneficije" #. 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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "Odbijen Porez do Datuma" @@ -10259,7 +10279,7 @@ msgstr "Porez na Fleksibilne Beneficije" #. 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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "Oporeziva Zarada do Datuma" @@ -10406,7 +10426,7 @@ msgstr "Vrijeme prije početka smjene tokom kojeg se prijava personala smatra za msgid "Theory" msgstr "Teorija" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "Ovaj mjesec ima više praznika nego radnih dana." @@ -10424,7 +10444,7 @@ msgstr "Nema slobodnih radnih mjesta prema planu zapošljavanja {0}" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "Nije dodijeljena struktura plaća za {0}. Prvo dodijelite strukturu plaća." @@ -10454,15 +10474,18 @@ msgstr "Ovo kompenzacijsko odsustvo će se primjenjivati od {0}." msgid "This employee already has a log with the same timestamp.{0}" msgstr "Personal već ima yapisnik sa istom vremenskom oznakom.{0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "Ova greška može biti posljedica nevažeće formule ili uvjeta." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "Ova greška može biti zbog nevažeće sintakse." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "Ova greška može biti zbog toga što polje nedostaje ili je izbrisano." @@ -10917,7 +10940,7 @@ msgstr "Ukupna težina za sve {0} mora biti suma do 100. Trenutno je {1}%" msgid "Total working Days Per Year" msgstr "Ukupno Radnih Dana u Godini" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "Ukupno radno vrijeme ne smije biti veće od maksimalnog radnog vremena {0}" @@ -11621,7 +11644,7 @@ msgstr "Niste prisutni cijeli dan(e) između dana zahtjeva za kompenzacijsko ods msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "Ne možete definirati više tabela ako imate tabelu bez donjih i gornjih granica." -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "Ne možete zatražiti svoju Standard Smjenu: {0}" @@ -11641,6 +11664,10 @@ msgstr "Možete učitati samo JPG, PNG, PDF, TXT ili Microsoft dokumente." msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "Ne možete stornirati više od ukupnog broja neplaćenih odsutnih dana {0}. Već ste stornirali {1} dana za ovog zaposlenika." +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "Nemate dopuštenje za promjenu statusa zahtjeva za smjenu." + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11817,7 +11844,7 @@ msgstr "{0} Nedostaje" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} Red #{1}: Formula je postavljena, ali {2} je onemogućeno za Komponentu Plate {3}." -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} Red #{1}: {2} treba omogućiti da bi se formula razmatrala." @@ -11904,7 +11931,7 @@ msgstr "{0} odsustva je ručno dodijelio {1} na {2}" msgid "{0} must be submitted" msgstr "{0} se mora poslati" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} od {1} Završeno" @@ -11940,7 +11967,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "{0}. Za više detalja provjerite zapisnik pogrešaka." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: E-pošta za personal nije pronađena, stoga e-pošta nije poslana" diff --git a/hrms/locale/hu.po b/hrms/locale/hu.po index a0519be7c5..5ce9aee3dc 100644 --- a/hrms/locale/hu.po +++ b/hrms/locale/hu.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Hungarian\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "" @@ -1712,7 +1718,7 @@ msgstr "" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4404,7 +4422,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5170,7 +5188,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5200,7 +5218,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8198,7 +8217,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9208,7 +9227,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9216,7 +9235,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10160,7 +10179,8 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10396,7 +10416,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11593,7 +11616,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/locale/id.po b/hrms/locale/id.po index 153b3d5545..15dbb55cc7 100644 --- a/hrms/locale/id.po +++ b/hrms/locale/id.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:55\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Indonesian\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Gaji tahunan" @@ -1712,7 +1718,7 @@ msgstr "Tanggal Pembayaran Bonus tidak bisa menjadi tanggal yang lalu" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "Karyawan {0} tentang Half hari {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "Karyawan yang bekerja pada hari libur" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "Dari Tanggal {0} tidak boleh setelah Tanggal Pelepasan karyawan {1}" @@ -4404,7 +4422,7 @@ msgstr "Dari Tanggal {0} tidak boleh setelah Tanggal Pelepasan karyawan {1}" msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "Dari Tanggal {0} tidak boleh sebelum karyawan bergabung Tanggal {1}" @@ -5170,7 +5188,7 @@ msgstr "Pemotongan Pajak Pendapatan" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "Slab Pajak Penghasilan" msgid "Income Tax Slab Other Charges" msgstr "Pajak Penghasilan Slab Biaya Lain" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "Lembaran Pajak Pendapatan harus berlaku pada atau sebelum Tanggal Mulai Periode Penggajian: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "Lembaran Pajak Pendapatan tidak disetel dalam Penetapan Struktur Gaji: {0}" @@ -5200,7 +5218,7 @@ msgstr "Lembaran Pajak Pendapatan tidak disetel dalam Penetapan Struktur Gaji: { msgid "Income Tax Slab: " msgstr "Slab Pajak Penghasilan: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "Lembaran Pajak Penghasilan: {0} dinonaktifkan" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "Tinggalkan Jenis {0} tidak dapat dicampuri" msgid "Leave Without Pay" msgstr "Cuti Tanpa Bayar" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "Leave Without Pay tidak cocok dengan catatan {} yang disetujui" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "Pay bersih yang belum bisa kurang dari 0" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "Tidak ada yang aktif atau gaji standar Struktur ditemukan untuk karyawan {0} untuk tanggal tertentu" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "Hanya Pemberi Persetujuan yang dapat Menyetujui Permintaan ini." @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "Hanya Tinggalkan Aplikasi status 'Disetujui' dan 'Ditolak' dapat disampaikan" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "Hanya Permintaan Shift dengan status 'Disetujui' dan 'Ditolak' yang dapat diajukan" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "Harap setel Penggajian berdasarkan dalam pengaturan Penggajian" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "Harap atur Perusahaan" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "Harap atur tanggal bergabung untuk karyawan {0}" @@ -8198,7 +8217,7 @@ msgstr "Silakan bagikan umpan balik Anda ke pelatihan dengan mengklik 'Feedb msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "Slip Gaji Preview" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "Slip Gaji karyawan {0} sudah dibuat untuk periode ini" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "Slip Gaji karyawan {0} sudah dibuat untuk daftar absen {1}" @@ -9208,7 +9227,7 @@ msgstr "Penetapan Struktur Gaji" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "Penugasan Struktur Gaji untuk Karyawan sudah ada" @@ -9216,7 +9235,7 @@ msgstr "Penugasan Struktur Gaji untuk Karyawan sudah ada" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "Struktur Gaji Hilang" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "Tugas Shift: {0} dibuat untuk Karyawan: {1}" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "Slip acara Gaji" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "Cuti sakit" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "Tanggal mulai dan akhir tidak dalam Periode Penggajian yang valid, tidak dapat menghitung {0}." @@ -10160,7 +10179,8 @@ msgstr "Tampilan Ringkas" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "Ada lebih dari hari kerja libur bulan ini." @@ -10396,7 +10416,7 @@ msgstr "Tidak ada lowongan di bawah rencana kepegawaian {0}" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "Karyawan ini sudah memiliki log dengan stempel waktu yang sama. {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "Jumlah jam kerja tidak boleh lebih besar dari max jam kerja {0}" @@ -11593,7 +11616,7 @@ msgstr "Anda tidak hadir sepanjang hari di antara hari-hari pembayaran cuti komp msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "Anda tidak dapat meminta Shift Default Anda: {0}" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "{0} harus diserahkan" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: email Karyawan tidak ditemukan, maka email tidak dikirim" diff --git a/hrms/locale/it.po b/hrms/locale/it.po index 6932b24d94..11347ff110 100644 --- a/hrms/locale/it.po +++ b/hrms/locale/it.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-09 15:37\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Italian\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "" @@ -1712,7 +1718,7 @@ msgstr "" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4404,7 +4422,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5170,7 +5188,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5200,7 +5218,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "scaglione dell'imposta sul reddito: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8198,7 +8217,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9208,7 +9227,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9216,7 +9235,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10160,7 +10179,8 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10396,7 +10416,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11593,7 +11616,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/locale/ko.po b/hrms/locale/ko.po index 869b4a0596..b278360c4f 100644 --- a/hrms/locale/ko.po +++ b/hrms/locale/ko.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Korean\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "" @@ -1712,7 +1718,7 @@ msgstr "" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4404,7 +4422,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5170,7 +5188,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5200,7 +5218,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8198,7 +8217,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9208,7 +9227,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9216,7 +9235,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10160,7 +10179,8 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10396,7 +10416,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11593,7 +11616,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/locale/my.po b/hrms/locale/my.po index 9e6edcb1ce..3084144d34 100644 --- a/hrms/locale/my.po +++ b/hrms/locale/my.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:55\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Burmese\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "ယခင်အသုံးမပြုရသေးသည့် ခွ msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "ပြီးခဲ့သော ကာလမှ အသုံးမပြုရသေးသည့် ခွင့်များကို လက်ရှိကာလ သို့ ထပ်ပေါင်းထည့်မည်။" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "နှစ်စဉ်လစာ" @@ -1712,7 +1718,7 @@ msgstr "" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4404,7 +4422,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5170,7 +5188,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5200,7 +5218,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8198,7 +8217,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9208,7 +9227,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9216,7 +9235,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10160,7 +10179,8 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10396,7 +10416,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11593,7 +11616,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/locale/nb.po b/hrms/locale/nb.po index c2e4aeba31..8a4b391b6d 100644 --- a/hrms/locale/nb.po +++ b/hrms/locale/nb.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:55\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Norwegian Bokmal\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "" @@ -1712,7 +1718,7 @@ msgstr "" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "Feil under evaluering av {doctype} {doclink} på rad {row_id}.

Feil under evaluering: {error}

Hint: {description}" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4404,7 +4422,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5170,7 +5188,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5200,7 +5218,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8198,7 +8217,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9208,7 +9227,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9216,7 +9235,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10160,7 +10179,8 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10396,7 +10416,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "Total vekt for alle {0} må summeres til 100. For øyeblikket er den {1} msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11593,7 +11616,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/locale/nl.po b/hrms/locale/nl.po index 56d896f06a..b80536f09d 100644 --- a/hrms/locale/nl.po +++ b/hrms/locale/nl.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Dutch\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "" @@ -1712,7 +1718,7 @@ msgstr "" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4404,7 +4422,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5170,7 +5188,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5200,7 +5218,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "Inkomstenbelastingplaat: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8198,7 +8217,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9208,7 +9227,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9216,7 +9235,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10160,7 +10179,8 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10396,7 +10416,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11593,7 +11616,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/locale/pl.po b/hrms/locale/pl.po index 9932125135..f2c93be323 100644 --- a/hrms/locale/pl.po +++ b/hrms/locale/pl.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-09 15:37\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Polish\n" "MIME-Version: 1.0\n" @@ -519,7 +519,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -866,6 +866,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "" @@ -1731,7 +1737,7 @@ msgstr "" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1833,11 +1839,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2296,7 +2302,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3424,7 +3430,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3452,7 +3458,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3517,6 +3523,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3670,7 +3687,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3686,7 +3704,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4415,7 +4433,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4423,7 +4441,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5189,7 +5207,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5203,15 +5221,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5219,7 +5237,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5455,7 +5473,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5827,7 +5845,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6244,7 +6262,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6731,11 +6749,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6747,7 +6765,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6820,7 +6838,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6848,7 +6867,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6979,7 +6998,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7160,7 +7179,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7305,7 +7324,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7329,7 +7348,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7423,7 +7442,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7947,7 +7966,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7991,7 +8010,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8118,7 +8137,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8163,7 +8182,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8217,7 +8236,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8275,8 +8294,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9150,11 +9169,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9227,7 +9246,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9235,7 +9254,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "" @@ -9247,7 +9266,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9301,7 +9320,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9706,7 +9725,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9914,7 +9933,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9926,7 +9945,7 @@ msgstr "" msgid "Sick Leave" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10035,7 +10054,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10179,7 +10198,8 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10205,7 +10225,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10250,7 +10270,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10397,7 +10417,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10415,7 +10435,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10445,15 +10465,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10908,7 +10931,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11612,7 +11635,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11632,6 +11655,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11808,7 +11835,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11895,7 +11922,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11931,7 +11958,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/locale/pt.po b/hrms/locale/pt.po index 3d8a076560..ba301bd6ec 100644 --- a/hrms/locale/pt.po +++ b/hrms/locale/pt.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Portuguese\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "" @@ -1712,7 +1718,7 @@ msgstr "" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4404,7 +4422,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5170,7 +5188,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5200,7 +5218,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "Escalão de IRS: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8198,7 +8217,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9208,7 +9227,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9216,7 +9235,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10160,7 +10179,8 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10396,7 +10416,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11593,7 +11616,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/locale/pt_BR.po b/hrms/locale/pt_BR.po index 3f5664c3fc..e0630d4d0a 100644 --- a/hrms/locale/pt_BR.po +++ b/hrms/locale/pt_BR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-09 15:37\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:55\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Portuguese, Brazilian\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -847,6 +847,12 @@ msgstr "" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "" @@ -1712,7 +1718,7 @@ msgstr "" msgid "Branch: {0}" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "" @@ -1814,11 +1820,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2277,7 +2283,7 @@ msgstr "" msgid "Currency " msgstr "Moeda " -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3405,7 +3411,7 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3433,7 +3439,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3498,6 +3504,17 @@ msgstr "" msgid "Employees working on a holiday" msgstr "" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3651,7 +3668,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3667,7 +3685,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4396,7 +4414,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4404,7 +4422,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5170,7 +5188,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5184,15 +5202,15 @@ msgstr "" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5200,7 +5218,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "Laje de Imposto de Renda: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5436,7 +5454,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5808,7 +5826,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6225,7 +6243,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6712,11 +6730,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6728,7 +6746,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6801,7 +6819,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6829,7 +6848,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6960,7 +6979,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7141,7 +7160,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7286,7 +7305,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7310,7 +7329,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7404,7 +7423,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7928,7 +7947,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7972,7 +7991,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8099,7 +8118,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8144,7 +8163,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8198,7 +8217,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8256,8 +8275,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9131,11 +9150,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9208,7 +9227,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9216,7 +9235,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "" @@ -9228,7 +9247,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9282,7 +9301,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9687,7 +9706,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9895,7 +9914,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9907,7 +9926,7 @@ msgstr "" msgid "Sick Leave" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10016,7 +10035,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10160,7 +10179,8 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10186,7 +10206,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10231,7 +10251,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10378,7 +10398,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10396,7 +10416,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10426,15 +10446,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10889,7 +10912,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11593,7 +11616,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11613,6 +11636,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11789,7 +11816,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11876,7 +11903,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11912,7 +11939,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/locale/ru.po b/hrms/locale/ru.po index 10e54d7af1..08c0052d06 100644 --- a/hrms/locale/ru.po +++ b/hrms/locale/ru.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-09 15:37\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Russian\n" "MIME-Version: 1.0\n" @@ -525,7 +525,7 @@ msgstr "Добавить неиспользованные дни отпуска msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "Добавьте неиспользованные отпуска из предыдущего отпускного периода к этому распределению" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "Добавлены налоговые компоненты из мастера «Компоненты зарплаты», поскольку структура зарплаты не имела налоговых компонентов." @@ -872,6 +872,12 @@ msgstr "Годовой лимит превышен" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Годовая зарплата" @@ -1737,7 +1743,7 @@ msgstr "Дата выплаты бонуса не может быть проше msgid "Branch: {0}" msgstr "Ветка: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "Массовые задания" @@ -1839,11 +1845,11 @@ msgstr "Невозможно отменить назначение смены: { msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "Невозможно отменить назначение смены: {0}, так как оно связано с проверкой сотрудника: {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "Невозможно создать расчетный листок для сотрудника, пришедшего на работу после расчетного периода" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "Невозможно создать расчетный листок для сотрудника, который уволился до расчетного периода" @@ -2305,7 +2311,7 @@ msgstr "Критерии, на основе которых сотрудник д msgid "Currency " msgstr "Валюта " -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "Валюта выбранного подоходного налога должна быть {0} вместо {1}" @@ -3433,7 +3439,7 @@ msgstr "У сотрудника {0} уже есть активная смена msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "Сотрудник {0} уже подал заявку {1} на расчетный период {2}" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "Сотрудник {0} уже подал заявку на смену {1}: {2}, которая пересекается с этим периодом" @@ -3461,7 +3467,7 @@ msgstr "Сотрудник {0} не найден среди участников msgid "Employee {0} on Half day on {1}" msgstr "Сотрудник {0} на половине дня {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "Сотрудник {0}, освобожденный {1}, должен быть установлен как \"Уволен\"" @@ -3526,6 +3532,17 @@ msgstr "Сотрудники без целей: {0}" msgid "Employees working on a holiday" msgstr "Сотрудники, работающие в праздничный день" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3679,7 +3696,8 @@ msgstr "Ошибка удаления {0}" msgid "Error downloading PDF" msgstr "Ошибка загрузки PDF" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "Ошибка в формуле или условия" @@ -3695,7 +3713,7 @@ msgstr "Ошибка в некоторых строках" msgid "Error updating {0}" msgstr "Ошибка обновления {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "Ошибка при оценке {doctype} {doclink} на строке {row_id}.

Ошибка: {error}

Подсказка: {description}" @@ -4424,7 +4442,7 @@ msgstr "Дата \"С\" должна быть раньше даты \"По\"" msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "Дата {0} не может быть позже даты окончания расчетного периода {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "Дата \"С\" {0} не может быть позже даты увольнения сотрудника {1}" @@ -4432,7 +4450,7 @@ msgstr "Дата \"С\" {0} не может быть позже даты уво msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "Дата {0} не может быть раньше даты начала расчетного периода {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "Дата \"С\" {0} не может быть раньше даты присоединения сотрудника {1}" @@ -5198,7 +5216,7 @@ msgstr "Удержания подоходного налога" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5212,15 +5230,15 @@ msgstr "Налоговая категория" msgid "Income Tax Slab Other Charges" msgstr "Прочие сборы налоговой категории" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "Налоговая категория обязательна, так как структура зарплаты {0} имеет налоговый компонент {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "Налоговая категория должна вступать в силу не позднее даты начала расчетного периода зарплаты: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "Налоговая категория не установлена в назначении структуры зарплаты: {0}" @@ -5228,7 +5246,7 @@ msgstr "Налоговая категория не установлена в н msgid "Income Tax Slab: " msgstr "Налоговая категория: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "Налоговая категория: {0} отключена" @@ -5464,7 +5482,7 @@ msgstr "Недействительные суммы пособий" msgid "Invalid Dates" msgstr "Недопустимые даты" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "Недействительные дни LWP отменены" @@ -5836,7 +5854,7 @@ msgstr "Ключевая область ответственности" msgid "Key Result Area" msgstr "Ключевая область результатов" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "Отмененные дни LWP ({0}) не соответствуют фактической сумме корректировок заработной платы ({1}) для сотрудника {2} с {3} по {4}" @@ -6253,7 +6271,7 @@ msgstr "Тип отпуска {0} не подлежит денежной ком msgid "Leave Without Pay" msgstr "Отпуск без сохранения заработной платы" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "Отпуск без сохранения заработной платы не соответствует утвержденным записям {}" @@ -6740,11 +6758,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "Отсутствует авансовый счет" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "Отсутствует обязательное поле" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "Отсутствующие вступительные записи" @@ -6756,7 +6774,7 @@ msgstr "Отсутствует дата смены" msgid "Missing Salary Components" msgstr "Отсутствующие компоненты заработной платы" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "Отсутствует налоговая плита" @@ -6829,7 +6847,8 @@ msgid "My Requests" msgstr "Мои запросы" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "Ошибка имени" @@ -6857,7 +6876,7 @@ msgstr "Чистая заработная плата (валюта компан msgid "Net Pay Info" msgstr "Информация о чистой оплате" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "Чистая заработная плата не может быть меньше 0" @@ -6988,7 +7007,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 "Не найдено ни одного активного сотрудника, связанного с идентификатором электронной почты {0}. Попробуйте войти, используя идентификатор электронной почты сотрудника, или обратитесь к менеджеру по персоналу для получения доступа." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "Для сотрудника {0} на указанные даты не найдено активной или стандартной структуры заработной платы" @@ -7169,7 +7188,7 @@ msgstr "Примечание: смена не будет перезаписан msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "Примечание: общее количество выделенных отпусков {0} не должно быть меньше уже утвержденных отпусков {1} за этот период" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "Примечание: Ваша зарплатная квитанция защищена паролем, пароль для разблокировки PDF-файла имеет формат {0}." @@ -7314,7 +7333,7 @@ msgstr "Вводные мероприятия" msgid "Onboarding Begins On" msgstr "Начало адаптации" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "Одобрить этот запрос могут только утверждающие." @@ -7338,7 +7357,7 @@ msgstr "К участию допускаются только собеседов msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "Подавать можно только заявления на отпуск со статусом «Одобрено» и «Отклонено»" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "Можно подать только запрос на смену со статусом 'Одобрено' или 'Отклонено'" @@ -7432,7 +7451,7 @@ msgstr "Запрос на перекрывающееся присутствие" msgid "Overlapping Shift Attendance" msgstr "Посещаемость перекрывающихся смен" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "Запросы на перекрывающиеся смены" @@ -7956,7 +7975,7 @@ msgstr "Сначала включите функцию «Автопосещен msgid "Please Select Company First" msgstr "Пожалуйста, сначала выберите компанию" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "Пожалуйста, сначала назначьте структуру заработной платы для сотрудника {0}, применимую с или до {1}" @@ -8000,7 +8019,7 @@ msgstr "Прежде чем получать данные о сверхуроч msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "Пожалуйста, уменьшите {0}, чтобы избежать наложения времени сдвига на себя." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "Пожалуйста, смотрите приложение." @@ -8127,7 +8146,7 @@ msgstr "Установите компонент заработка для тип msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "Пожалуйста, установите расчет заработной платы на основе настроек расчета заработной платы" @@ -8172,7 +8191,7 @@ msgstr "Пожалуйста, установите Шаблон оценки д msgid "Please set the Company" msgstr "Пожалуйста, укажите компанию" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "Пожалуйста, установите дату вступления в должность для сотрудника {0}" @@ -8226,7 +8245,7 @@ msgstr "Пожалуйста, оставьте свой отзыв об обуч msgid "Please specify the job applicant to be updated." msgstr "Пожалуйста, укажите соискателя, данные о котором необходимо обновить." -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "Пожалуйста, укажите {0} и {1} (если есть) для правильного расчета налога в будущих зарплатных ведомостях." @@ -8284,8 +8303,8 @@ msgstr "Запретить самостоятельное одобрение з msgid "Prevent self approval for leaves even if user has permissions" msgstr "Запретить самостоятельное одобрение отпусков, даже если у пользователя есть разрешения" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "Предварительный просмотр расчетного листка" @@ -9159,11 +9178,11 @@ msgstr "Создание зарплатной расписки поставле msgid "Salary Slip not found." msgstr "Расчетный листок не найден." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "Расчетный листок сотрудника {0} уже создан за этот период" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "Расчетный лист сотрудника {0} уже создан для табеля учета рабочего времени {1}" @@ -9236,7 +9255,7 @@ msgstr "Назначение структуры заработной платы" msgid "Salary Structure Assignment field" msgstr "Поле назначения структуры заработной платы" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "Назначение структуры заработной платы для сотрудника уже существует" @@ -9244,7 +9263,7 @@ msgstr "Назначение структуры заработной платы msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "Назначение структуры заработной платы не найдено для сотрудника {0} на дату {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "Структура заработной платы отсутствует" @@ -9256,7 +9275,7 @@ msgstr "Структура заработной платы должна быть msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "Структура заработной платы не назначена сотруднику {0} на дату {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "Структура заработной платы {0} не принадлежит компании {1}" @@ -9310,7 +9329,7 @@ msgstr "Компоненты заработной платы типа «Фонд msgid "Salary components should be part of the Salary Structure." msgstr "Компоненты заработной платы должны быть частью структуры заработной платы." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "Письма с зарплатными расписками поставлены в очередь на отправку. Проверьте статус {0}." @@ -9715,7 +9734,7 @@ msgstr "История назначений смен" msgid "Shift Assignment Tool" msgstr "Инструмент назначения смен" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "Назначение смены: {0} создано для сотрудника: {1}" @@ -9923,7 +9942,7 @@ msgstr "Показывать остатки отпусков в расчетно msgid "Show Leaves Of All Department Members In Calendar" msgstr "Показывать отпуска всех сотрудников отдела в календаре" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "Показать расчетный лист" @@ -9935,7 +9954,7 @@ msgstr "Показ" msgid "Sick Leave" msgstr "Больничный" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "Одиночное задание" @@ -10044,7 +10063,7 @@ msgstr "Стандартная сумма налогового вычета" msgid "Standard Working Hours" msgstr "Стандартные рабочие часы" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "Даты начала и окончания не попадают в допустимый расчетный период, невозможно рассчитать {0}." @@ -10188,7 +10207,8 @@ msgstr "Обобщенный вид" msgid "Sync {0}" msgstr "Синхронизация {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "Синтаксическая ошибка" @@ -10214,7 +10234,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "Налог вычтен до даты" @@ -10259,7 +10279,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "Налогооблагаемый доход на дату" @@ -10406,7 +10426,7 @@ msgstr "Время до начала смены, в течение которо msgid "Theory" msgstr "Теория" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "В этом месяце праздников больше, чем рабочих дней." @@ -10424,7 +10444,7 @@ msgstr "В штатном расписании вакансий нет {0}" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "Для {0} не назначена структура заработной платы. Сначала назначьте структуру заработной платы." @@ -10454,15 +10474,18 @@ msgstr "Этот компенсационный отпуск будет прим msgid "This employee already has a log with the same timestamp.{0}" msgstr "У этого сотрудника уже есть журнал с такой же временной меткой.{0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "Эта ошибка может быть вызвана неверной формулой или условием." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "Эта ошибка может быть вызвана неверным синтаксисом." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "Эта ошибка может быть вызвана отсутствием или удалением поля." @@ -10917,7 +10940,7 @@ msgstr "Суммарный вес всех {0} должен составлять msgid "Total working Days Per Year" msgstr "Всего рабочих дней в году" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "Общее количество рабочих часов не должно превышать максимальное количество рабочих часов {0}" @@ -11621,7 +11644,7 @@ msgstr "Вы не присутствуете на работе в течение msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "Вы не сможете определить несколько плит, если у вас есть плита без нижних и верхних пределов." -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "Вы не можете запросить смену по умолчанию: {0}" @@ -11641,6 +11664,10 @@ msgstr "Вы можете загружать только документы в msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "Вы не можете отменить более {0}дней отпуска. Вы уже отменили {1} дней отпуска для этого сотрудника." +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11817,7 +11844,7 @@ msgstr "{0} Отсутствует" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} Строка #{1}: Формула задана, но {2} отключена для компонента зарплаты {3}." -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} Строка #{1}: {2} должна быть включена для рассмотрения формулы." @@ -11904,7 +11931,7 @@ msgstr "{0} отпусков было вручную назначено поль msgid "{0} must be submitted" msgstr "{0} должно быть отправлено" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} из {1} завершено" @@ -11940,7 +11967,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "{0}. Проверьте журнал ошибок для получения более подробной информации." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: Email сотрудника не найден, поэтому письмо не отправлено" diff --git a/hrms/locale/sl.po b/hrms/locale/sl.po index af18d31616..eebd8ec98f 100644 --- a/hrms/locale/sl.po +++ b/hrms/locale/sl.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Slovenian\n" "MIME-Version: 1.0\n" @@ -525,7 +525,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "Dodane so bile davčne komponente iz glavnega menija Komponenta plače, ker struktura plač ni imela davčne komponente." @@ -872,6 +872,12 @@ msgstr "Presežena Letna Dodelitev" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Letna Plača" @@ -1737,7 +1743,7 @@ msgstr "Datum izplačila bonusa ne more biti pretekli datum" msgid "Branch: {0}" msgstr "Podružnica: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "Množične dodelitve" @@ -1839,11 +1845,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:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" @@ -2302,7 +2308,7 @@ msgstr "" msgid "Currency " msgstr "Valuta " -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "" @@ -3430,7 +3436,7 @@ msgstr "Osebje {0} že ima aktivno izmeno {1}: {2}, ki se prekriva s tem obdobje msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "Osebje {0} je že oddal vlogo {1} za obračunsko obdobje {2}" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "Osebje {0} se je že prijavil za izmeno {1}: {2}, ki se prekriva s tem obdobjem" @@ -3458,7 +3464,7 @@ msgstr "Osebje {0} ni mogoče najti med udeleženci usposabljanja." msgid "Employee {0} on Half day on {1}" msgstr "Osebje {0} na pol dneva na {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "Osebje {0}, ki je bil odpuščen dne {1}, mora biti nastavljen kot »Odšel«" @@ -3523,6 +3529,17 @@ msgstr "Osebje brez ciljev: {0}" msgid "Employees working on a holiday" msgstr "Zaposleni, ki delajo na praznik" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3676,7 +3693,8 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "" @@ -3692,7 +3710,7 @@ msgstr "" msgid "Error updating {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "" @@ -4421,7 +4439,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:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "" @@ -4429,7 +4447,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:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "" @@ -5195,7 +5213,7 @@ msgstr "" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5209,15 +5227,15 @@ msgstr "Tabela Davka od Plač" msgid "Income Tax Slab Other Charges" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5225,7 +5243,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "Tabela Davka od Plač: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5461,7 +5479,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5833,7 +5851,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6250,7 +6268,7 @@ msgstr "" msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6737,11 +6755,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6753,7 +6771,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6826,7 +6844,8 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "" @@ -6854,7 +6873,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "" @@ -6985,7 +7004,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7166,7 +7185,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:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7311,7 +7330,7 @@ msgstr "" msgid "Onboarding Begins On" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "" @@ -7335,7 +7354,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "" @@ -7429,7 +7448,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7953,7 +7972,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7997,7 +8016,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "" @@ -8124,7 +8143,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8169,7 +8188,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8223,7 +8242,7 @@ msgstr "" msgid "Please specify the job applicant to be updated." msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8281,8 +8300,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "" @@ -9156,11 +9175,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9233,7 +9252,7 @@ msgstr "" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "" @@ -9241,7 +9260,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "" @@ -9253,7 +9272,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9307,7 +9326,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9712,7 +9731,7 @@ msgstr "" msgid "Shift Assignment Tool" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "" @@ -9920,7 +9939,7 @@ msgstr "" msgid "Show Leaves Of All Department Members In Calendar" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "" @@ -9932,7 +9951,7 @@ msgstr "" msgid "Sick Leave" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "" @@ -10041,7 +10060,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10185,7 +10204,8 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "" @@ -10211,7 +10231,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10256,7 +10276,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10403,7 +10423,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "" @@ -10421,7 +10441,7 @@ msgstr "" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10451,15 +10471,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10914,7 +10937,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11618,7 +11641,7 @@ msgstr "" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "" @@ -11638,6 +11661,10 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11814,7 +11841,7 @@ msgstr "" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "" @@ -11901,7 +11928,7 @@ msgstr "{0} dopustov je ročno dodelil {1} dne {2}" msgid "{0} must be submitted" msgstr "" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "" @@ -11937,7 +11964,7 @@ msgstr "" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/locale/sr.po b/hrms/locale/sr.po index 26f2a5d344..3bb6dd576e 100644 --- a/hrms/locale/sr.po +++ b/hrms/locale/sr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Serbian (Cyrillic)\n" "MIME-Version: 1.0\n" @@ -525,7 +525,7 @@ msgstr "Додај неискоришћене дане одсуства из п msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "Додај неискоришћене дане одсуства из претходног периода у ову расподелу" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "Додате пореске компоненте из мастер података компоненте зараде јер структура зараде није имала ниједну пореску компоненту." @@ -872,6 +872,12 @@ msgstr "Годишња расподела је премашена" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Годишња зарада" @@ -1737,7 +1743,7 @@ msgstr "Датум исплате бонуса не може бити у про msgid "Branch: {0}" msgstr "Филијала: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "Масовна додела" @@ -1839,11 +1845,11 @@ msgstr "Није могуће отказати доделу смене: {0} је msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "Не може се отказати додела смене: {0} јер је повезана са записом о присуству: {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "Није могуће креирати обрачунски листић за запослено лице које се запослило након обрачунског периода" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "Није могуће креирати обрачунски листић за запослено лице које је отишло пре обрачунског периода" @@ -2303,7 +2309,7 @@ msgstr "Критеријуми на основу којих запослена msgid "Currency " msgstr "Валута " -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "Валута изабраног пореског разреда пореза на доходак треба да буде {0} уместо {1}" @@ -3431,7 +3437,7 @@ msgstr "Запослено лице {0} већ има активну смену msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "Запослено лице {0} је већ поднело захтев {1} за обрачунски период {2}" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "Запослено лице {0} је већ поднело захтев за смену {1}: {2} која се преклапа у овом периоду" @@ -3459,7 +3465,7 @@ msgstr "Запослено лице {0} није пронађено међу у msgid "Employee {0} on Half day on {1}" msgstr "Запослено лице {0} је на половини радног дана {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "Запослено лице {0} разрешено на {1} мора бити означено као 'Прекинут радни однос'" @@ -3524,6 +3530,17 @@ msgstr "Запослена лица без циљева: {0}" msgid "Employees working on a holiday" msgstr "Запослена лица која раде током празника" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3677,7 +3694,8 @@ msgstr "Грешка приликом брисања {0}" msgid "Error downloading PDF" msgstr "Грешка приликом преузимања PDF" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "Грешка у формули или услову" @@ -3693,7 +3711,7 @@ msgstr "Грешка у неким редовима" msgid "Error updating {0}" msgstr "Грешка приликом ажурирања {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "Грешка приликом обраде {doctype} {doclink} у реду {row_id}.

Грешка: {error}

Савет: {description}" @@ -4422,7 +4440,7 @@ msgstr "Датум почетка мора бити испред датума з msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "Датум почетка {0} не може бити након датума завршетка обрачунског периода {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "Датум почетка {0} не може бити после датума престанка радног односа {1}" @@ -4430,7 +4448,7 @@ msgstr "Датум почетка {0} не може бити после дату msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "Датум почетка {0} не може бити пре датума почетка обрачунског периода {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "Датум почетка {0} не може бити пре датума запослења {1}" @@ -5196,7 +5214,7 @@ msgstr "Одбици пореза на доходак" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5210,15 +5228,15 @@ msgstr "Порески разред пореза на доходак" msgid "Income Tax Slab Other Charges" msgstr "Остали намети у пореском разреду пореза на доходак" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "Порески разред пореза на доходак је обавезан с обзиром да структура зараде {0} садржи пореску компоненту {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "Порески разред пореза на доходак мора бити важећи на или пре почетка обрачунског периода: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "Порески разред пореза на доходак није постављен у додели структуре зараде: {0}" @@ -5226,7 +5244,7 @@ msgstr "Порески разред пореза на доходак није п msgid "Income Tax Slab: " msgstr "Порески разред пореза на доходак: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "Порески разред пореза на доходак: {0} је онемогућен" @@ -5462,7 +5480,7 @@ msgstr "Неважећи износ бенефиција" msgid "Invalid Dates" msgstr "Неважећи датуми" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "Неважећи број сторнираних дана одсуства без накнаде" @@ -5834,7 +5852,7 @@ msgstr "Кључна област одговорности" msgid "Key Result Area" msgstr "Кључна област резултата" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "Број сторнираних дана одсуства без накнаде ({0}) се не поклапа са укупним износом корекције обрачуна зараде ({1}) за запослено лице {2} у периоду од {3} до {4}" @@ -6251,7 +6269,7 @@ msgstr "Врста одсуства {0} није предмет исплате" msgid "Leave Without Pay" msgstr "Одсуство без накнаде" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "Одсуство без накнаде не одговара одобреним {} записима" @@ -6738,11 +6756,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "Недостаје аконтациони рачун" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "Недостаје обавезно поље" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "Недостају уноси почетног стања" @@ -6754,7 +6772,7 @@ msgstr "Недостаје датум престанка радног однос msgid "Missing Salary Components" msgstr "Недостаје компонента зараде" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "Недостаје порески разред" @@ -6827,7 +6845,8 @@ msgid "My Requests" msgstr "Моји захтеви" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "Назив грешке" @@ -6855,7 +6874,7 @@ msgstr "Нето зарада (валута компаније)" msgid "Net Pay Info" msgstr "Информације о нето заради" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "Нето зарада не може бити мања од 0" @@ -6986,7 +7005,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 "Нема активног запосленог лица повезаног са имејл ИД {0}. Покушајте да се пријавите са пословним имејлом или контактирајте HR менаџера за приступ." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "Није пронађена активна или подразумевана структура зараде за запослено лице {0} за наведене датуме" @@ -7167,7 +7186,7 @@ msgstr "Напомена: Смена неће бити преписана у п msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "Напомена: Укупно додељених одсуства {0} не може бити мање од већ одобрених одсуства {1} за период" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "Напомена: Ваш обрачунски листић је заштићен лозинком, лозинка за откључавање PDF-а има формат {0}." @@ -7312,7 +7331,7 @@ msgstr "Активности увођења" msgid "Onboarding Begins On" msgstr "Увођење почиње на" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "Искључиво одобраваоци могу да одобре овај захтев." @@ -7336,7 +7355,7 @@ msgstr "Искључиво интервјуи са статусом успешн msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "Искључиво захтев за одсуством са статусом 'Одобрено' или 'Одбијено' може бити поднет" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "Искључиво захтев за радну смену са статусом 'Одобрено' или 'Одбијено' може бити поднет" @@ -7430,7 +7449,7 @@ msgstr "Преклапајући захтев за евидентирање пр msgid "Overlapping Shift Attendance" msgstr "Преклапајуће присуство у сменама" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "Преклапајући захтеви за радне смене" @@ -7954,7 +7973,7 @@ msgstr "Молимо Вас да омогућите аутоматску еви msgid "Please Select Company First" msgstr "Молимо Вас да прво изаберете компанију" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "Молимо Вас да прво доделите структуру зараде запосленом лицу {0} која важи од или пре {1}" @@ -7998,7 +8017,7 @@ msgstr "Молимо Вас да унесете запослено лице, д msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "Молимо Вас да смањите {0} да бисте избегли преклапање времена смене" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "Молимо Вас да погледате прилог" @@ -8125,7 +8144,7 @@ msgstr "Молимо Вас да поставите компоненту при msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "Молимо Вас да подесите основу за обрачун зараде у подешавањима обрачуна зараде" @@ -8170,7 +8189,7 @@ msgstr "Молимо Вас да подесите шаблон евалуаци msgid "Please set the Company" msgstr "Молимо Вас да поставите компанију" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "Молимо Вас да поставите датум запослења за запослено лице {0}" @@ -8224,7 +8243,7 @@ msgstr "Молимо Вас да поделите Вашу повратну ин msgid "Please specify the job applicant to be updated." msgstr "Молимо Вас да наведете кандидата за посао који треба да буде ажуриран." -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "Молимо Вас да наведете {0} и {1} (уколико постоје), ради правилног обрачуна пореза у будућим обрачунским листићима." @@ -8282,8 +8301,8 @@ msgstr "Спречити самоодобравање захтева за тро msgid "Prevent self approval for leaves even if user has permissions" msgstr "Онемогући самоодобравање одсуства чак и уколико корисник има дозволе" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "Преглед обрачунског листића" @@ -9157,11 +9176,11 @@ msgstr "Креирање обрачунског листића је у реду msgid "Salary Slip not found." msgstr "Обрачунски листић није пронађен." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "Обрачунски листић запосленог лица {0} је већ креиран за овај период" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "Обрачунски листић запосленог лица {0} је већ креиран за временску евиденцију {1}" @@ -9234,7 +9253,7 @@ msgstr "Додела структуре зараде" msgid "Salary Structure Assignment field" msgstr "Поље за доделу структуре зараде" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "Додела структуре зараде за запослено лице већ постоји" @@ -9242,7 +9261,7 @@ msgstr "Додела структуре зараде за запослено л msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "Додела структуре зараде није пронађена за запослено лице {0} на датум {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "Недостаје структура зараде" @@ -9254,7 +9273,7 @@ msgstr "Структура зараде мора бити поднета пре msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "Структура зараде није додељена запосленом лицу {0} за датум {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "Структура зараде {0} не припада компанији {1}" @@ -9308,7 +9327,7 @@ msgstr "Компоненте зараде врсте пензиони фонд, msgid "Salary components should be part of the Salary Structure." msgstr "Компонента зараде би требало да буде део структуре зараде." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "Имејлови са обрачунским листићима су стављени у ред за слање. Проверите {0} за статус." @@ -9713,7 +9732,7 @@ msgstr "Историја доделе смене" msgid "Shift Assignment Tool" msgstr "Алат за доделу смене" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "Додела смене: {0} је креирана за запослено лице: {1}" @@ -9921,7 +9940,7 @@ msgstr "Прикажи стање одсуства у обрачунском л msgid "Show Leaves Of All Department Members In Calendar" msgstr "Прикажи одсуства свих чланова одељења у календару" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "Прикажи обрачунски листић" @@ -9933,7 +9952,7 @@ msgstr "Приказано" msgid "Sick Leave" msgstr "Боловање" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "Једна додела" @@ -10042,7 +10061,7 @@ msgstr "Стандардни износ пореског ослобођења" msgid "Standard Working Hours" msgstr "Стандардни радни часови" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "Почетни и крајњи датуми нису важећи у обрачунском периоду, није могуће израчунати {0}." @@ -10186,7 +10205,8 @@ msgstr "Сажети приказ" msgid "Sync {0}" msgstr "Синхронизуј {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "Грешка синтаксе" @@ -10212,7 +10232,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "Порез одбијен до данас" @@ -10257,7 +10277,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "Опорезиви приходи до данас" @@ -10404,7 +10424,7 @@ msgstr "Време почетка смене у којем се пријава msgid "Theory" msgstr "Теорија" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "Овај месец има више празника него радних дана." @@ -10422,7 +10442,7 @@ msgstr "Нема непопуњених радних места према пл #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "Структура зараде није додељена за {0}. Прво морате доделити структуру зараде." @@ -10452,15 +10472,18 @@ msgstr "Ово компензационо одсуство биће примењ msgid "This employee already has a log with the same timestamp.{0}" msgstr "Ово запослено лице већ има евидентиран унос са истим временом.{0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "Грешка може бити узрокована неисправном формулом или условом." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "Грешка може бити узрокована неисправном синтаксом." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "Грешка може бити узрокована недостајућим или обрисаним пољем." @@ -10915,7 +10938,7 @@ msgstr "Укупан пондер за све {0} мора износити 100. msgid "Total working Days Per Year" msgstr "Укупан број радних дана годишње" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "Укупно радних часова не сме бити веће од максималних радних часова {0}" @@ -11619,7 +11642,7 @@ msgstr "Нисте били присутни током свих дана у п msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "Не можете дефинисати више разреда уколико већ постоји разред без доњих и горњих граница." -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "Не можете тражити своју подразумевану смену: {0}" @@ -11639,6 +11662,10 @@ msgstr "Можете отпремити искључиво JPG, PNG, PDF, ТXТ msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "Није могуће сторнирати више од укупног броја дана одсуства без накнаде {0}. Већ сте сторнирали {1} дана за ово запослено лице." +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11815,7 +11842,7 @@ msgstr "{0} недостаје" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} Ред #{1}: Формула је постављена, али је {2} онемогућено за компоненту зараде {3}." -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} Ред#{1}: {2} мора бити омогућено да би се формула узела у обзир." @@ -11902,7 +11929,7 @@ msgstr "{0} одсуства су ручно додељена од стране msgid "{0} must be submitted" msgstr "{0} мора бити поднето" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} од {1} завршено" @@ -11938,7 +11965,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "{0}. Проверите евиденцију грешака за више детаља." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: Имејл запосленог лица није пронађен, због чега имејл није ни послат" diff --git a/hrms/locale/sr_CS.po b/hrms/locale/sr_CS.po index 2a63beba76..f8ca42a253 100644 --- a/hrms/locale/sr_CS.po +++ b/hrms/locale/sr_CS.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:55\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Serbian (Latin)\n" "MIME-Version: 1.0\n" @@ -525,7 +525,7 @@ msgstr "Dodaj neiskorišćene dane odsustva iz prethodnih raspodela" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "Dodaj neiskorišćene dane odsustva iz prethodnog perioda u ovu raspodelu" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "Dodate poreske komponente iz master podataka komponente zarade jer struktura zarade nije imala nijednu poresku komponentu." @@ -872,6 +872,12 @@ msgstr "Godišnja raspodela je premašena" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Godišnja zarada" @@ -1737,7 +1743,7 @@ msgstr "Datum isplate bonusa ne može biti u prošlosti" msgid "Branch: {0}" msgstr "Filijala: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "Masovna dodela" @@ -1839,11 +1845,11 @@ msgstr "Nije moguće otkazati dodelu smene: {0} jer je povezana sa prisustvom: { msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "Ne može se otkazati dodela smene: {0} jer je povezana sa zapisom o prisustvu: {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "Nije moguće kreirati obračunski listić za zaposleno lice koje se zaposlilo nakon obračunskog perioda" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "Nije moguće kreirati obračunski listić za zaposleno lice koje je otišlo pre obračunskog perioda" @@ -2303,7 +2309,7 @@ msgstr "Kriterijumi na osnovu kojih zaposlena lica treba da budu ocenjena u povr msgid "Currency " msgstr "Valuta " -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "Valuta izabranog poreskog razreda poreza na dohodak treba da bude {0} umesto {1}" @@ -3431,7 +3437,7 @@ msgstr "Zaposleno lice {0} već ima aktivnu smenu {1}: {2} koja se preklapa u ov msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "Zaposleno lice {0} je već podnelo zahtev {1} za obračunski period {2}" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "Zaposleno lice {0} je već podnelo zahtev za smenu {1}: {2} koja se preklapa u ovom periodu" @@ -3459,7 +3465,7 @@ msgstr "Zaposleno lice {0} nije pronađeno među učesnicima događaja obuke." msgid "Employee {0} on Half day on {1}" msgstr "Zaposleno lice {0} je na polovini radnog dana {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "Zaposleno lice {0} razrešeno na {1} mora biti označeno kao 'Prekinut radni odnos'" @@ -3524,6 +3530,17 @@ msgstr "Zaposlena lica bez ciljeva: {0}" msgid "Employees working on a holiday" msgstr "Zaposlena lica koja rade tokom praznika" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3677,7 +3694,8 @@ msgstr "Greška prilikom brisanja {0}" msgid "Error downloading PDF" msgstr "Greška prilikom preuzimanja PDF" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "Greška u formuli ili uslovu" @@ -3693,7 +3711,7 @@ msgstr "Greška u nekim redovima" msgid "Error updating {0}" msgstr "Greška prilikom ažuriranja {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "Greška prilikom obrade {doctype} {doclink} u redu {row_id}.

Greška: {error}

Savet: {description}" @@ -4422,7 +4440,7 @@ msgstr "Datum početka mora biti ispred datuma završetka" msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "Datum početka {0} ne može biti nakon datuma završetka obračunskog perioda {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "Datum početka {0} ne može biti posle datuma prestanka radnog odnosa {1}" @@ -4430,7 +4448,7 @@ msgstr "Datum početka {0} ne može biti posle datuma prestanka radnog odnosa {1 msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "Datum početka {0} ne može biti pre datuma početka obračunskog perioda {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "Datum početka {0} ne može biti pre datuma zaposlenja {1}" @@ -5196,7 +5214,7 @@ msgstr "Odbici poreza na dohodak" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5210,15 +5228,15 @@ msgstr "Poreski razred poreza na dohodak" msgid "Income Tax Slab Other Charges" msgstr "Ostali nameti u poreskom razredu poreza na dohodak" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "Poreski razred poreza na dohodak je obavezan s obzirom da struktura zarade {0} sadrži poresku komponentu {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "Poreski razred poreza na dohodak mora biti važeći na ili pre početka obračunskog perioda: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "Poreski razred poreza na dohodak nije postavljen u dodeli strukture zarade: {0}" @@ -5226,7 +5244,7 @@ msgstr "Poreski razred poreza na dohodak nije postavljen u dodeli strukture zara msgid "Income Tax Slab: " msgstr "Poreski razred poreza na dohodak: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "Poreski razred poreza na dohodak: {0} je onemogućen" @@ -5462,7 +5480,7 @@ msgstr "Nevažeći iznosi beneficija" msgid "Invalid Dates" msgstr "Nevažeći datumi" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "Nevažeći broj storniranih dana odsustva bez naknade" @@ -5834,7 +5852,7 @@ msgstr "Ključna oblast odgovornosti" msgid "Key Result Area" msgstr "Ključna oblast rezultata" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "Broj storniranih dana odsustva bez naknade ({0}) se ne poklapa sa ukupnim iznosom korekcije obračuna zarade ({1}) za zaposleno lice {2} u periodu od {3} do {4}" @@ -6251,7 +6269,7 @@ msgstr "Vrsta odsustva {0} nije predmet isplate" msgid "Leave Without Pay" msgstr "Odsustvo bez naknade" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "Odsustvo bez naknade ne odgovara odobrenim {} zapisima" @@ -6738,11 +6756,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "Nedostaje akontacioni račun" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "Nedostaje obavezno polje" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "Nedostaju unosi početnog stanja" @@ -6754,7 +6772,7 @@ msgstr "Nedostaje datum prestanka radnog odnosa" msgid "Missing Salary Components" msgstr "Nedostaje komponenta zarade" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "Nedostaje poreski razred" @@ -6827,7 +6845,8 @@ msgid "My Requests" msgstr "Moji zahtevi" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "Naziv greške" @@ -6855,7 +6874,7 @@ msgstr "Neto zarada (valuta kompanije)" msgid "Net Pay Info" msgstr "Informacije o neto zaradi" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "Neto zarada ne može biti manja od 0" @@ -6986,7 +7005,7 @@ msgstr "Nije pronađena aktivna dodela strukture zarade za zaposleno lice {0} sa 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 "Nema aktivnog zaposlenog lica povezanog sa imejl ID {0}. Pokušajte da se prijavite sa poslovnim imejlom ili kontaktirajte HR menadžera za pristup." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "Nije pronađena aktivna ili podrazumevana struktura zarade za zaposleno lice {0} za navedene datume" @@ -7167,7 +7186,7 @@ msgstr "Napomena: Smena neće biti prepisana u postojećim evidencijama prisustv msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "Napomena: Ukupno dodeljenih odsustva {0} ne može biti manje od već odobrenih odsustva {1} za period" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "Napomena: Vaš obračunski listić je zaštićen lozinkom, lozinka za otključavanje PDF-a ima format {0}." @@ -7312,7 +7331,7 @@ msgstr "Aktivnosti uvođenja" msgid "Onboarding Begins On" msgstr "Uvođenje počinje na" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "Isključivo odobravaoci mogu da odobre ovaj zahtev." @@ -7336,7 +7355,7 @@ msgstr "Isključivo intervjui sa statusom uspešno ili odbijeno mogu biti podnet msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "Isključivo zahtev za odsustvom sa statusom 'Odobreno' ili 'Odbijeno' može biti podnet" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "Isključivo zahtev za radnu smenu sa statusom 'Odobreno' ili 'Odbijeno' može biti podnet" @@ -7430,7 +7449,7 @@ msgstr "Preklapajući zahtev za evidentiranje prisustva" msgid "Overlapping Shift Attendance" msgstr "Preklapajuće prisustvo u smenama" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "Preklapajući zahtevi za radne smene" @@ -7954,7 +7973,7 @@ msgstr "Molimo Vas da omogućite automatsku evidenciju prisustva i završite pos msgid "Please Select Company First" msgstr "Molimo Vas da prvo izaberete kompaniju" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "Molimo Vas da prvo dodelite strukturu zarade zaposlenom licu {0} koja važi od ili pre {1}" @@ -7998,7 +8017,7 @@ msgstr "Molimo Vas da unesete zaposleno lice, datum knjiženja i kompaniju pre p msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "Molimo Vas da smanjite {0} da biste izbegli preklapanje vremena smene" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "Molimo Vas da pogledate prilog" @@ -8125,7 +8144,7 @@ msgstr "Molimo Vas da postavite komponentu prihoda za vrstu odsustva: {0}." msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "Molimo Vas da podesite osnovu za obračun zarade u podešavanjima obračuna zarade" @@ -8170,7 +8189,7 @@ msgstr "Molimo Vas da podesite šablon evaluacije za sve {0} ili da izaberete š msgid "Please set the Company" msgstr "Molimo Vas da postavite kompaniju" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "Molimo Vas da postavite datum zaposlenja za zaposleno lice {0}" @@ -8224,7 +8243,7 @@ msgstr "Molimo Vas da podelite Vašu povratnu informaciju o obuci klikom na 'Pov msgid "Please specify the job applicant to be updated." msgstr "Molimo Vas da navedete kandidata za posao koji treba da bude ažuriran." -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "Molimo Vas da navedete {0} i {1} (ukoliko postoje), radi pravilnog obračuna poreza u budućim obračunskim listićima." @@ -8282,8 +8301,8 @@ msgstr "Sprečiti samoodobravanje zahteva za troškove i ukoliko korisnik ima do msgid "Prevent self approval for leaves even if user has permissions" msgstr "Onemogući samoodobravanje odsustva čak i ukoliko korisnik ima dozvole" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "Pregled obračunskog listića" @@ -9157,11 +9176,11 @@ msgstr "Kreiranje obračunskog listića je u redu čekanja. Može potrajati neko msgid "Salary Slip not found." msgstr "Obračunski listić nije pronađen." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "Obračunski listić zaposlenog lica {0} je već kreiran za ovaj period" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "Obračunski listić zaposlenog lica {0} je već kreiran za vremensku evidenciju {1}" @@ -9234,7 +9253,7 @@ msgstr "Dodela strukture zarade" msgid "Salary Structure Assignment field" msgstr "Polje za dodelu strukture zarade" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "Dodela strukture zarade za zaposleno lice već postoji" @@ -9242,7 +9261,7 @@ msgstr "Dodela strukture zarade za zaposleno lice već postoji" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "Dodela strukture zarade nije pronađena za zaposleno lice {0} na datum {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "Nedostaje struktura zarade" @@ -9254,7 +9273,7 @@ msgstr "Struktura zarade mora biti podneta pre podnošenja {0}" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "Struktura zarade nije dodeljena zaposlenom licu {0} za datum {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "Struktura zarade {0} ne pripada kompaniji {1}" @@ -9308,7 +9327,7 @@ msgstr "Komponente zarade vrste penzioni fond, dodatni penzioni fond ili kredit msgid "Salary components should be part of the Salary Structure." msgstr "Komponenta zarade bi trebalo da bude deo strukture zarade." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "Imejlovi sa obračunskim listićima su stavljeni u red za slanje. Proverite {0} za status." @@ -9713,7 +9732,7 @@ msgstr "Istorija dodele smene" msgid "Shift Assignment Tool" msgstr "Alat za dodelu smene" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "Dodela smene: {0} je kreirana za zaposleno lice: {1}" @@ -9921,7 +9940,7 @@ msgstr "Prikaži stanje odsustva u obračunskom listiću" msgid "Show Leaves Of All Department Members In Calendar" msgstr "Prikaži odsustva svih članova odeljenja u kalendaru" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "Prikaži obračunski listić" @@ -9933,7 +9952,7 @@ msgstr "Prikazano" msgid "Sick Leave" msgstr "Bolovanje" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "Jedna dodela" @@ -10042,7 +10061,7 @@ msgstr "Standardni iznos poreskog oslobođenja" msgid "Standard Working Hours" msgstr "Standardni radni časovi" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "Početni i krajnji datumi nisu važeći u obračunskom periodu, nije moguće izračunati {0}." @@ -10186,7 +10205,8 @@ msgstr "Sažeti prikaz" msgid "Sync {0}" msgstr "Sinhronizuj {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "Greška sintakse" @@ -10212,7 +10232,7 @@ msgstr "Porezi i beneficije" #. 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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "Porez odbijen do danas" @@ -10257,7 +10277,7 @@ msgstr "Porez na fleksibilne beneficije" #. 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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "Oporezivi prihodi do danas" @@ -10404,7 +10424,7 @@ msgstr "Vreme početka smene u kojem se prijava zaposlenog lica računa kao pris msgid "Theory" msgstr "Teorija" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "Ovaj mesec ima više praznika nego radnih dana." @@ -10422,7 +10442,7 @@ msgstr "Nema nepopunjenih radnih mesta prema planu osoblja {0}" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "Struktura zarade nije dodeljena za {0}. Prvo morate dodeliti strukturu zarade." @@ -10452,15 +10472,18 @@ msgstr "Ovo kompenzaciono odsustvo biće primenjivo od {0}." msgid "This employee already has a log with the same timestamp.{0}" msgstr "Ovo zaposleno lice već ima evidentiran unos sa istim vremenom.{0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "Greška može biti uzrokovana neispravnom formulom ili uslovom." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "Greška može biti uzrokovana neispravnom sintaksom." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "Greška može biti uzrokovana nedostajućim ili obrisanim poljem." @@ -10915,7 +10938,7 @@ msgstr "Ukupan ponder za sve {0} mora iznositi 100. Trenutno je {1}%" msgid "Total working Days Per Year" msgstr "Ukupan broj radnih dana godišnje" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "Ukupno radnih časova ne sme biti veće od maksimalnih radnih časova {0}" @@ -11619,7 +11642,7 @@ msgstr "Niste bili prisutni tokom svih dana u periodu za koji ste podneli zahtev msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "Ne možete definisati više razreda ukoliko već postoji razred bez donjih i gornjih granica." -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "Ne možete tražiti svoju podrazumevanu smenu: {0}" @@ -11639,6 +11662,10 @@ msgstr "Možete otpremiti isključivo JPG, PNG, PDF, TXT ili Majkrosoft dokument msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "Nije moguće stornirati više od ukupnog broja dana odsustva bez naknade {0}. Već ste stornirali {1} dana za ovo zaposleno lice." +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11815,7 +11842,7 @@ msgstr "{0} nedostaje" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} Red #{1}: Formula je postavljena, ali je {2} onemogućeno za komponentu zarade {3}." -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} Red#{1}: {2} mora biti omogućeno da bi se formula uzela u obzir." @@ -11902,7 +11929,7 @@ msgstr "{0} odsustva su ručno dodeljena od strane {1} na {2}" msgid "{0} must be submitted" msgstr "{0} mora biti podneto" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} od {1} završeno" @@ -11938,7 +11965,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "{0}. Proverite evidenciju grešaka za više detalja." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: Imejl zaposlenog lica nije pronađen, zbog čega imejl nije ni poslat" diff --git a/hrms/locale/sv.po b/hrms/locale/sv.po index b80f55d8a6..e762f5a22f 100644 --- a/hrms/locale/sv.po +++ b/hrms/locale/sv.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-14 18:05\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -525,7 +525,7 @@ msgstr "Lägg till oanvänd frånvaro från tidigare tilldelningar" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "Lägg till oanvänd frånvaro från tidigare frånvaro period tilldelning till denna tilldelning" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "La till skattkomponenter från lönekomponenter eftersom löneart inte hade någon skattkomponent." @@ -872,6 +872,12 @@ msgstr "Årlig Tilldelning Överskriden" msgid "Annual CTC" msgstr "Årslön" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "Årlig Brutto Inkomst" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Årslön" @@ -1737,7 +1743,7 @@ msgstr "Bonus Betalning Datum kan inte vara tidigare datum" msgid "Branch: {0}" msgstr "Branch: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "Mass Tilldelningar" @@ -1839,11 +1845,11 @@ msgstr "Kan inte avbryta Skift Tilldelning: {0} eftersom det är kopplad till N msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "Kan inte avbryta Skift Tilldelning: {0} eftersom det är kopplad till Personal Stämpling: {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "Kan inte skapa Lönespecifikation för Personal som börjar efter Löneperiod" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "Kan inte skapa Lönespecifikation för Personal som slutat före Löneperiod" @@ -2305,7 +2311,7 @@ msgstr "Kriterier baserade på vilken Personal som ska Bedömas i Prestation Åt msgid "Currency " msgstr "Valuta" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "Valuta för vald Inkomst Skatt Tabell ska vara {0} istället för {1}" @@ -3433,7 +3439,7 @@ msgstr "Personal {0} har redan aktivt Skift {1}: {2} som överlappar under denna msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "Personal {0} har redan skickat in ansökan {1} för Löne Period {2}" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "Personal {0} har redan ansökt om Skift {1}: {2} som överlappar under denna period" @@ -3461,7 +3467,7 @@ msgstr "Personal {0} hittades inte i Utbildning Händelse Deltagare." msgid "Employee {0} on Half day on {1}" msgstr "Personal {0} halvdag {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "Personal {0} som avskedades {1} måste anges som 'Slutat'" @@ -3526,6 +3532,17 @@ msgstr "Personal utan Mål: {0}" msgid "Employees working on a holiday" msgstr "Helg Personal" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "Arbetsgivare Avgift" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "Arbetsgivare Avgifter" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3679,7 +3696,8 @@ msgstr "Fel vid borttagning av {0}" msgid "Error downloading PDF" msgstr "Fel vid nedladdning av PDF" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "Fel i formel eller villkor" @@ -3695,7 +3713,7 @@ msgstr "Fel i vissa rader" msgid "Error updating {0}" msgstr "Fel vid uppdatering av {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "Fel vid utvärdering av {doctype} {doclink} på rad {row_id}.

Fel: {error}

Tips: {description}" @@ -4424,7 +4442,7 @@ msgstr "Från Datum kan inte vara senare än Till Datum" msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "Från datum {0} kan inte vara efter löneperiod slut datum {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "Från Datum {0} kan inte vara efter Personal avgång Datum {1}" @@ -4432,7 +4450,7 @@ msgstr "Från Datum {0} kan inte vara efter Personal avgång Datum {1}" msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "Från datum {0} kan inte vara före löneperiod start datum {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "Från Datum {0} kan inte vara före Personal anställning Datum {1}" @@ -5198,7 +5216,7 @@ msgstr "Inkomst Skatt Avdrag" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5212,15 +5230,15 @@ msgstr "Inkomst Skatt Tabell" msgid "Income Tax Slab Other Charges" msgstr "Inkomst Skatt Tabell Övriga Avgifter" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "Inkomst Skatt Tabell erfordras eftersom Löneart {0} har skattkomponent {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "Inkomst Skatt Tabell måste vara aktiv före eller före start datum för Löneperiod Start Datum: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "Inkomst Skatt Tabell inte angiven i Löneart Tilldelning: {0}" @@ -5228,7 +5246,7 @@ msgstr "Inkomst Skatt Tabell inte angiven i Löneart Tilldelning: {0}" msgid "Income Tax Slab: " msgstr "Inkomst Skatt Tabell: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "Inkomst Skatt Tabell: {0} är inaktiverad" @@ -5464,7 +5482,7 @@ msgstr "Ogiltiga Förmån Belopp" msgid "Invalid Dates" msgstr "Ogiltiga Datum" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "Ogiltiga Obetalda Frånvaro Dagar Återförda" @@ -5836,7 +5854,7 @@ msgstr "Nyckel Ansvar Område" msgid "Key Result Area" msgstr "Nyckel Resultat Område" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "Obetalda Frånvaro Dagar Återförda ({0}) stämmer inte med faktiska totala Lönekorrigeringar ({1}) för {2} från {3} till {4}" @@ -6253,7 +6271,7 @@ msgstr "Frånvaro Typ {0} är inte uttagbar" msgid "Leave Without Pay" msgstr "Obetald Frånvaro" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "Obetald Frånvaro stämmer inte med godkända {} poster" @@ -6740,11 +6758,11 @@ msgstr "Minimum antal arbetsdagar som erfordras sedan tillträde för att ansök msgid "Missing Advance Account" msgstr "Förskott Konto saknas" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "Erfordrad fält saknas" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "Öppning poster saknas" @@ -6756,7 +6774,7 @@ msgstr "Saknar Avgång Datum" msgid "Missing Salary Components" msgstr "Lönekomponenter saknas" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "Inkomst Skatt Tabell saknas" @@ -6829,7 +6847,8 @@ msgid "My Requests" msgstr "Mina Begäran" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "Namn Fel" @@ -6857,7 +6876,7 @@ msgstr "Netto Lön (Bolag Valuta)" msgid "Net Pay Info" msgstr "Netto Lön" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "Netto Lön kan inte vara lägre än 0" @@ -6988,7 +7007,7 @@ msgstr "Inget aktivt löneart tilldelning hittades för {0} med löneart {1} på 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 "Ingen aktiv personal hittades kopplad till e-post {0}. Försök att logga in med personal e-post eller kontakta Personal Ansvarig för åtkomst." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "Ingen aktiv eller standard löneart hittades för {0} för angivna datum" @@ -7169,7 +7188,7 @@ msgstr "Obs! Skift kommer inte att skrivas över i befintliga närvaro poster" msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "Obs! Totalt antal tilldelad frånvaro {0} ska inte vara lägre än redan godkänd frånvaro {1} för period" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "Obs: Lönespecifikation är lösenord skyddad, lösenord för att låsa upp PDF fil är {0} format." @@ -7314,7 +7333,7 @@ msgstr "Introduktion Aktiviteter" msgid "Onboarding Begins On" msgstr "Introduktion Börjar" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "Endast Godkännare Roll kan godkänna denna Förslag." @@ -7338,7 +7357,7 @@ msgstr "Endast intervjuer med status Klar eller Avvisad kan godkännas." msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "Endast Frånvaro Ansökan med status 'Godkänd' och 'Avvisad' kan skickas in" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "Endast Skift förfågan med status 'Godkänd' och 'Avvisad' kan skickas in" @@ -7432,7 +7451,7 @@ msgstr "Överlappande Närvaro Begäran" msgid "Overlapping Shift Attendance" msgstr "Överlappande Skift Närvaro" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "Överlappande Skift Begäranden" @@ -7956,7 +7975,7 @@ msgstr "Aktivera Automatisk Närvaro och slutför installation." msgid "Please Select Company First" msgstr "Välj Bolag" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "Tilldela först Löneart för {0} som gäller från eller före {1}" @@ -8000,7 +8019,7 @@ msgstr "Ange Personal, Bokföring Datum och Bolag innan du hämtar övertid deta msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "Minska {0} för att undvika att skifttid överlappar sig själv" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "Se Bilaga" @@ -8127,7 +8146,7 @@ msgstr "Ange Inkomst Komponent för Frånvaro Typ: {0}." msgid "Please set Leave Approver for the Employee: {0}" msgstr "Ange Frånvaro Godkännande för: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "Ange Lön baserad på Löneinställningar" @@ -8172,7 +8191,7 @@ msgstr "Ange Utvärdering Mall för alla {0} eller välj mall i Personal Instäl msgid "Please set the Company" msgstr "Ange Bolag" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "Ange Anställning Datum för Personal {0}" @@ -8226,7 +8245,7 @@ msgstr "Dela din återkoppling till utbildning genom att klicka på 'Utbildning msgid "Please specify the job applicant to be updated." msgstr "Ange jobbsökande som ska uppdateras." -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "Ange {0} och {1} (om sådana finns), för korrekt skatteberäkning i framtida lönespecifikationer." @@ -8284,8 +8303,8 @@ msgstr "Förhindra självgodkännande för utlägg anspråk även om användare msgid "Prevent self approval for leaves even if user has permissions" msgstr "Förhindra självgodkännande för frånvaro även om användare har behörighet" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "Förhandsgranska Lönespecifikation" @@ -9159,11 +9178,11 @@ msgstr "Lönespecifikation skapande i kö. Det kan ta några minuter" msgid "Salary Slip not found." msgstr "Lönespecifikation hittades inte." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "Lönespecifikation för {0} redan skapad för denna period" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "Lönespecifikation för {0} redan skapad för Tidrapport {1}" @@ -9236,7 +9255,7 @@ msgstr "Löneart Tilldelning" msgid "Salary Structure Assignment field" msgstr "Löneart Tilldelning fält" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "Löneart Tilldelning för Personal finns redan" @@ -9244,7 +9263,7 @@ msgstr "Löneart Tilldelning för Personal finns redan" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "Löneart tilldelning hittades inte för {0} per den {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "Löneart Saknas" @@ -9256,7 +9275,7 @@ msgstr "Löneart måste godkännas innan {0} godkänns" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "Löneart är inte tilldelad för {0} per den {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "Löneart {0} tillhör inte bolag {1}" @@ -9310,7 +9329,7 @@ msgstr "Lönekomponenter av typ Förmånsfond, Extra Förmånsfond eller Förmå msgid "Salary components should be part of the Salary Structure." msgstr "Lönekomponenter ska vara en del av Löneart." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "Lönespecifikationer är i e-post kö att skickas. Kontrollera {0} för status." @@ -9715,7 +9734,7 @@ msgstr "Skifttilldelning Historik" msgid "Shift Assignment Tool" msgstr "Skift Tilldelning Verktyg" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "Skift Tilldelning: {0} skapad för Personal: {1}" @@ -9923,7 +9942,7 @@ msgstr "Visa Frånvaro Saldo på Lönespecifikation" msgid "Show Leaves Of All Department Members In Calendar" msgstr "Visa Frånvaro för alla Avdelning Medlemmar på Kalender" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "Visa Lönespecifikation" @@ -9935,7 +9954,7 @@ msgstr "Visning" msgid "Sick Leave" msgstr "Sjuk Frånvaro" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "Singel Tilldelning" @@ -10044,7 +10063,7 @@ msgstr "Standard Skatt Dispans Belopp" msgid "Standard Working Hours" msgstr "Standard Arbetstid" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "Start och Slut Datum inte i giltig Löneeriod, kan inte beräkna {0}." @@ -10188,7 +10207,8 @@ msgstr "Översikt Vy" msgid "Sync {0}" msgstr "Synkronisera {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "Syntaxfel" @@ -10214,7 +10234,7 @@ msgstr " Skatt & Förmåner" #. 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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "Skatt Avdragen Till Datum" @@ -10259,7 +10279,7 @@ msgstr "Skatt på Flexibel Förmån" #. 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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "Beskattningbar Inkomst Till Datum" @@ -10406,7 +10426,7 @@ msgstr "Tiden före Skift Start tid under vilken Personal Stämpling anses vara msgid "Theory" msgstr "Teori" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "Det finns mer helger än arbetsdagar denna månad." @@ -10424,7 +10444,7 @@ msgstr "Det finns inga lediga jobb inom bemanning plan {0}" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "Det finns ingen Löneart tilldelad till {0}. Tilldela Löneart först." @@ -10454,15 +10474,18 @@ msgstr "Denna kompensation frånvaro gäller från och med {0}." msgid "This employee already has a log with the same timestamp.{0}" msgstr "Personal har redan logg med samma tidstämpel. {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "Detta fel kan bero på ogiltig formel eller villkor." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "Det här felet kan bero på ogiltig syntax." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "Detta fel kan bero på att fält saknas eller tagits bort." @@ -10917,7 +10940,7 @@ msgstr "Total vikt för alla {0} måste uppgå till 100 %. För närvarande är msgid "Total working Days Per Year" msgstr "Totalt antal Arbetsdagar per År" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "Totalt arbetstid ska inte vara högre än maximum arbetstid {0}" @@ -11621,7 +11644,7 @@ msgstr "Du är inte närvarande hela dagen/dagarna mellan de dagar du begär kom msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "Du kan inte definiera flera tabeller om du har tabell utan nedre och övre gräns." -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "Man kan inte begära din Standard Skift: {0}" @@ -11641,6 +11664,10 @@ msgstr "Du kan bara ladda upp JPG, PNG, PDF, TXT eller Microsoft Dokument." msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "Du kan inte återföra mer än total antal obetald frånvaro dagar {0}. Du har redan återfört {1} dagar för denna personal." +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "Du har inte behörighet att ändra status för Skift Begäran." + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11817,7 +11844,7 @@ msgstr "{0} Saknas" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} Rad #{1}: Formel är angiven men {2} är inaktiverad för Lönekomponent {3}." -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} Rad #{1}: {2} måste vara aktiverad för att formen ska beaktas." @@ -11904,7 +11931,7 @@ msgstr "{0} ledigheter tilldelades manuellt av {1} {2}" msgid "{0} must be submitted" msgstr "{0} måste godkännas" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} av {1} Slutförda" @@ -11940,7 +11967,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "{0}. Kontrollera fellogg för mer information." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: Personal E-post hittades inte, därför skickades inte E-post" diff --git a/hrms/locale/th.po b/hrms/locale/th.po index ca667dd56a..39ed777abc 100644 --- a/hrms/locale/th.po +++ b/hrms/locale/th.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:55\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Thai\n" "MIME-Version: 1.0\n" @@ -525,7 +525,7 @@ msgstr "เพิ่มวันลาที่ไม่ได้ใช้จา msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "เพิ่มวันลาที่ไม่ได้ใช้จากการจัดสรรรอบการลาก่อนหน้ามายังการจัดสรรนี้" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "เพิ่มองค์ประกอบภาษีจากข้อมูลหลักขององค์ประกอบเงินเดือน เนื่องจากโครงสร้างเงินเดือนไม่มีองค์ประกอบภาษี" @@ -872,6 +872,12 @@ msgstr "เกินการจัดสรรประจำปี" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "เงินเดือนประจำปี" @@ -1737,7 +1743,7 @@ msgstr "วันที่จ่ายโบนัสต้องไม่เป msgid "Branch: {0}" msgstr "สาขา: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "การมอบหมายจำนวนมาก" @@ -1839,11 +1845,11 @@ msgstr "ไม่สามารถยกเลิกการมอบหมา msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "ไม่สามารถยกเลิกการมอบหมายกะ: {0} เนื่องจากเชื่อมโยงกับการบันทึกเวลาเข้างานของพนักงาน: {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "ไม่สามารถสร้างสลิปเงินเดือนสำหรับพนักงานที่เริ่มงานหลังรอบการจ่ายเงินเดือนได้" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "ไม่สามารถสร้างสลิปเงินเดือนสำหรับพนักงานที่ลาออกก่อนรอบการจ่ายเงินเดือนได้" @@ -2305,7 +2311,7 @@ msgstr "เกณฑ์ที่ใช้ในการให้คะแนน msgid "Currency " msgstr "สกุลเงิน" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "สกุลเงินของขั้นภาษีเงินได้ที่เลือกควรเป็น {0} แทนที่จะเป็น {1}" @@ -3433,7 +3439,7 @@ msgstr "พนักงาน {0} มีกะที่ใช้งานอย msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "พนักงาน {0} ได้ยื่นใบสมัคร {1} สำหรับรอบการจ่ายเงินเดือน {2} แล้ว" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "พนักงาน {0} ได้สมัครกะ {1}: {2} ที่ทับซ้อนภายในช่วงเวลานี้แล้ว" @@ -3461,7 +3467,7 @@ msgstr "ไม่พบพนักงาน {0} ในผู้เข้าร msgid "Employee {0} on Half day on {1}" msgstr "พนักงาน {0} ทำงานครึ่งวันในวันที่ {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "พนักงาน {0} ที่พ้นสภาพในวันที่ {1} ต้องตั้งค่าเป็น 'ลาออกแล้ว'" @@ -3526,6 +3532,17 @@ msgstr "พนักงานที่ไม่มีเป้าหมาย: { msgid "Employees working on a holiday" msgstr "พนักงานที่ทำงานในวันหยุด" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3679,7 +3696,8 @@ msgstr "เกิดข้อผิดพลาดในการลบ {0}" msgid "Error downloading PDF" msgstr "เกิดข้อผิดพลาดในการดาวน์โหลด PDF" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "เกิดข้อผิดพลาดในสูตรหรือเงื่อนไข" @@ -3695,7 +3713,7 @@ msgstr "เกิดข้อผิดพลาดในบางแถว" msgid "Error updating {0}" msgstr "เกิดข้อผิดพลาดในการอัปเดต {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "เกิดข้อผิดพลาดขณะประมวลผล {doctype} {doclink} ที่แถว {row_id}

ข้อผิดพลาด: {error}

คำแนะนำ: {description}" @@ -4424,7 +4442,7 @@ msgstr "วันที่เริ่มต้นต้องมาก่อน msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "ตั้งแต่วันที่ {0} ไม่สามารถเป็นวันที่หลังวันสิ้นสุดรอบการจ่ายเงินเดือน {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "วันที่เริ่มต้น {0} ต้องไม่หลังวันที่พ้นสภาพของพนักงาน {1}" @@ -4432,7 +4450,7 @@ msgstr "วันที่เริ่มต้น {0} ต้องไม่ห msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "ตั้งแต่วันที่ {0} ไม่สามารถเป็นก่อนวันที่เริ่มต้นของรอบการจ่ายเงินเดือน {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "วันที่เริ่มต้น {0} ต้องไม่ก่อนวันที่เริ่มงานของพนักงาน {1}" @@ -5198,7 +5216,7 @@ msgstr "รายการหักลดหย่อนภาษีเงิน #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5212,15 +5230,15 @@ msgstr "ขั้นภาษีเงินได้" msgid "Income Tax Slab Other Charges" msgstr "ค่าธรรมเนียมอื่น ๆ ของขั้นภาษีเงินได้" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "ต้องระบุขั้นภาษีเงินได้เนื่องจากโครงสร้างเงินเดือน {0} มีองค์ประกอบภาษี {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "ขั้นภาษีเงินได้ต้องมีผลบังคับใช้ในหรือก่อนวันที่เริ่มต้นรอบการจ่ายเงินเดือน: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "ไม่ได้ตั้งค่าขั้นภาษีเงินได้ในการมอบหมายโครงสร้างเงินเดือน: {0}" @@ -5228,7 +5246,7 @@ msgstr "ไม่ได้ตั้งค่าขั้นภาษีเงิ msgid "Income Tax Slab: " msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "ขั้นภาษีเงินได้: {0} ถูกปิดใช้งาน" @@ -5464,7 +5482,7 @@ msgstr "จำนวนผลประโยชน์ที่ไม่ถูก msgid "Invalid Dates" msgstr "วันที่ไม่ถูกต้อง" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "วัน LWP ที่ไม่ถูกต้องถูกยกเลิก" @@ -5836,7 +5854,7 @@ msgstr "พื้นที่ความรับผิดชอบหลัก msgid "Key Result Area" msgstr "ตัวชี้วัดผลงานหลัก" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "LWP Days Reversed ({0}) ไม่ตรงกับยอดรวมการแก้ไขเงินเดือนจริง ({1}) สำหรับพนักงาน {2} จาก {3} ถึง {4}" @@ -6253,7 +6271,7 @@ msgstr "ประเภทการลา {0} ไม่สามารถแล msgid "Leave Without Pay" msgstr "การลาโดยไม่ได้รับค่าจ้าง" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "การลาโดยไม่ได้รับค่าจ้างไม่ตรงกับบันทึกที่อนุมัติแล้ว {}" @@ -6740,11 +6758,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "บัญชีล่วงหน้าสูญหาย" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "ฟิลด์ที่จำเป็นหายไป" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "ไม่พบรายการเปิดบัญชี" @@ -6756,7 +6774,7 @@ msgstr "ไม่พบวันที่พ้นสภาพ" msgid "Missing Salary Components" msgstr "ส่วนประกอบเงินเดือนที่ขาดหาย" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "ไม่พบขั้นภาษี" @@ -6829,7 +6847,8 @@ msgid "My Requests" msgstr "คำขอของฉัน" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "ชื่อผิดพลาด" @@ -6857,7 +6876,7 @@ msgstr "รายรับสุทธิ (สกุลเงินบริษ msgid "Net Pay Info" msgstr "ข้อมูลรายรับสุทธิ" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "รายรับสุทธิไม่สามารถน้อยกว่า 0" @@ -6988,7 +7007,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 "ไม่พบพนักงานที่ใช้งานอยู่ที่เชื่อมโยงกับรหัสอีเมล {0} โปรดลองเข้าสู่ระบบด้วยรหัสอีเมลพนักงานของคุณหรือติดต่อผู้จัดการฝ่ายบุคคลเพื่อขอสิทธิ์การเข้าถึง" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "ไม่พบโครงสร้างเงินเดือนที่ใช้งานอยู่หรือเป็นค่าเริ่มต้นสำหรับพนักงาน {0} ในวันที่ที่ระบุ" @@ -7169,7 +7188,7 @@ msgstr "หมายเหตุ: กะจะไม่ถูกเขียน msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "หมายเหตุ: จำนวนวันลาที่จัดสรรทั้งหมด {0} ไม่ควรน้อยกว่าจำนวนวันลาที่อนุมัติแล้ว {1} สำหรับรอบเวลานั้น" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "หมายเหตุ: สลิปเงินเดือนของคุณมีการป้องกันด้วยรหัสผ่าน รหัสผ่านเพื่อปลดล็อก PDF อยู่ในรูปแบบ {0}" @@ -7314,7 +7333,7 @@ msgstr "กิจกรรมการเริ่มงานของพนั msgid "Onboarding Begins On" msgstr "การเริ่มงานของพนักงานใหม่เริ่มในวันที่" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "เฉพาะผู้อนุมัติเท่านั้นที่สามารถอนุมัติคำขอนี้ได้" @@ -7338,7 +7357,7 @@ msgstr "สามารถส่งได้เฉพาะการสัมภ msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "สามารถส่งได้เฉพาะใบลาที่มีสถานะ 'อนุมัติแล้ว' และ 'ถูกปฏิเสธ' เท่านั้น" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "สามารถส่งได้เฉพาะคำขอกะที่มีสถานะ 'อนุมัติแล้ว' และ 'ถูกปฏิเสธ' เท่านั้น" @@ -7432,7 +7451,7 @@ msgstr "คำขอการเข้างานทับซ้อน" msgid "Overlapping Shift Attendance" msgstr "การเข้างานกะทับซ้อน" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "คำขอกะทับซ้อน" @@ -7956,7 +7975,7 @@ msgstr "โปรดเปิดใช้งานการเข้างาน msgid "Please Select Company First" msgstr "โปรดเลือกบริษัทก่อน" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "โปรดกำหนดโครงสร้างเงินเดือนสำหรับพนักงาน {0} ที่มีผลบังคับใช้ตั้งแต่วันที่ {1} หรือก่อนหน้านั้นก่อน" @@ -8000,7 +8019,7 @@ msgstr "กรุณากรอกข้อมูลพนักงาน ว msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "โปรดลด {0} เพื่อหลีกเลี่ยงเวลาทับซ้อนของกะ" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "โปรดดูไฟล์แนบ" @@ -8127,7 +8146,7 @@ msgstr "โปรดตั้งค่าองค์ประกอบราย msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "โปรดตั้งค่าบัญชีเงินเดือนตามในการตั้งค่าบัญชีเงินเดือน" @@ -8172,7 +8191,7 @@ msgstr "โปรดตั้งค่าแม่แบบการประเ msgid "Please set the Company" msgstr "โปรดตั้งค่าบริษัท" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "โปรดตั้งค่าวันที่เริ่มงานสำหรับพนักงาน {0}" @@ -8226,7 +8245,7 @@ msgstr "โปรดแบ่งปันข้อเสนอแนะของ msgid "Please specify the job applicant to be updated." msgstr "โปรดระบุผู้สมัครงานที่จะอัปเดต" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "โปรดระบุ {0} และ {1} (ถ้ามี) เพื่อการคำนวณภาษีที่ถูกต้องในสลิปเงินเดือนในอนาคต" @@ -8284,8 +8303,8 @@ msgstr "ป้องกันไม่ให้ผู้ใช้อนุมั msgid "Prevent self approval for leaves even if user has permissions" msgstr "ป้องกันการอนุมัติการลาของตนเองแม้ว่าผู้ใช้จะมีสิทธิ์ก็ตาม" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "ดูตัวอย่างสลิปเงินเดือน" @@ -9159,11 +9178,11 @@ msgstr "การสร้างสลิปเงินเดือนอยู msgid "Salary Slip not found." msgstr "ไม่พบสลิปเงินเดือน" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "สลิปเงินเดือนของพนักงาน {0} ได้ถูกสร้างขึ้นสำหรับรอบเวลานี้แล้ว" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "สลิปเงินเดือนของพนักงาน {0} ได้ถูกสร้างขึ้นสำหรับไทม์ชีท {1} แล้ว" @@ -9236,7 +9255,7 @@ msgstr "การกำหนดโครงสร้างเงินเดื msgid "Salary Structure Assignment field" msgstr "ฟิลด์การกำหนดโครงสร้างเงินเดือน" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "มีรายการกำหนดโครงสร้างเงินเดือนสำหรับพนักงานนี้อยู่แล้ว" @@ -9244,7 +9263,7 @@ msgstr "มีรายการกำหนดโครงสร้างเง msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "ไม่พบงานมอบหมายโครงสร้างเงินเดือนสำหรับพนักงาน {0} ในวันที่ {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "ไม่มีโครงสร้างเงินเดือน" @@ -9256,7 +9275,7 @@ msgstr "ต้องส่งโครงสร้างเงินเดือ msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "โครงสร้างเงินเดือนไม่ได้รับมอบหมายสำหรับพนักงาน {0} สำหรับวันที่ {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "โครงสร้างเงินเดือน {0} ไม่ได้เป็นของบริษัท {1}" @@ -9310,7 +9329,7 @@ msgstr "ส่วนประกอบเงินเดือนประเภ msgid "Salary components should be part of the Salary Structure." msgstr "องค์ประกอบเงินเดือนควรเป็นส่วนหนึ่งของโครงสร้างเงินเดือน" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "อีเมลสลิปเงินเดือนได้เข้าคิวเพื่อรอส่งแล้ว ตรวจสอบสถานะที่ {0}" @@ -9715,7 +9734,7 @@ msgstr "ประวัติการมอบหมายกะ" msgid "Shift Assignment Tool" msgstr "เครื่องมือมอบหมายกะ" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "การมอบหมายกะ: {0} ถูกสร้างขึ้นสำหรับพนักงาน: {1}" @@ -9923,7 +9942,7 @@ msgstr "แสดงยอดวันลาคงเหลือในสลิ msgid "Show Leaves Of All Department Members In Calendar" msgstr "แสดงการลาของสมาชิกทุกคนในแผนกในปฏิทิน" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "แสดงสลิปเงินเดือน" @@ -9935,7 +9954,7 @@ msgstr "กำลังแสดง" msgid "Sick Leave" msgstr "ลาป่วย" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "การมอบหมายเดี่ยว" @@ -10044,7 +10063,7 @@ msgstr "จำนวนเงินยกเว้นภาษีมาตรฐ msgid "Standard Working Hours" msgstr "ชั่วโมงทำงานมาตรฐาน" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "วันที่เริ่มต้นและสิ้นสุดไม่อยู่ในรอบการจ่ายเงินเดือนที่ถูกต้อง ไม่สามารถคำนวณ {0} ได้" @@ -10188,7 +10207,8 @@ msgstr "มุมมองสรุป" msgid "Sync {0}" msgstr "ซิงค์ {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "ข้อผิดพลาดทางไวยากรณ์" @@ -10214,7 +10234,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "ภาษีที่หัก ณ วันที่" @@ -10259,7 +10279,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "รายรับที่ต้องเสียภาษีจนถึงปัจจุบัน" @@ -10406,7 +10426,7 @@ msgstr "เวลาก่อนเวลาเริ่มต้นกะซึ msgid "Theory" msgstr "ทฤษฎี" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "เดือนนี้มีวันหยุดมากกว่าวันทำงาน" @@ -10424,7 +10444,7 @@ msgstr "ไม่มีตำแหน่งงานว่างภายใต #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "ไม่มีโครงสร้างเงินเดือนที่กำหนดไว้สำหรับ {0}กรุณาเลือกโครงสร้างเงินเดือนก่อน" @@ -10454,15 +10474,18 @@ msgstr "การลาชดเชยนี้จะมีผลบังคั msgid "This employee already has a log with the same timestamp.{0}" msgstr "พนักงานนี้มีบันทึกที่มีการประทับเวลาเดียวกันอยู่แล้ว {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "ข้อผิดพลาดนี้อาจเกิดจากสูตรหรือเงื่อนไขที่ไม่ถูกต้อง" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "ข้อผิดพลาดนี้อาจเกิดจากไวยากรณ์ที่ไม่ถูกต้อง" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "ข้อผิดพลาดนี้อาจเกิดจากฟิลด์ที่หายไปหรือถูกลบ" @@ -10917,7 +10940,7 @@ msgstr "น้ำหนักรวมทั้งหมดสำหรับ {0 msgid "Total working Days Per Year" msgstr "จำนวนวันทำงานทั้งหมดต่อปี" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "ชั่วโมงทำงานทั้งหมดไม่ควรมากกว่าชั่วโมงทำงานสูงสุดที่ {0}" @@ -11621,7 +11644,7 @@ msgstr "คุณไม่ได้มาทำงานตลอดทั้ง msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "คุณไม่สามารถกำหนดหลายขั้นได้หากคุณมีขั้นที่ไม่มีขีดจำกัดล่างและบน" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "คุณไม่สามารถขอกะเริ่มต้นของคุณได้: {0}" @@ -11641,6 +11664,10 @@ msgstr "คุณสามารถอัปโหลดได้เฉพาะ msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "คุณไม่สามารถย้อนกลับได้มากกว่าจำนวนวัน LWP ทั้งหมด {0}คุณได้ย้อนกลับไปแล้ว {1} วันสำหรับพนักงานคนนี้" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11817,7 +11844,7 @@ msgstr "ไม่มี {0}" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} แถวที่ #{1}: มีการตั้งค่าสูตรแต่ {2} ถูกปิดใช้งานสำหรับองค์ประกอบเงินเดือน {3}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} แถวที่ #{1}: ต้องเปิดใช้งาน {2} เพื่อให้พิจารณาสูตร" @@ -11904,7 +11931,7 @@ msgstr "{0} วันลาถูกจัดสรรด้วยตนเอ msgid "{0} must be submitted" msgstr "ต้องส่ง {0}" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} จาก {1} เสร็จสมบูรณ์" @@ -11940,7 +11967,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "{0}ตรวจสอบบันทึกข้อผิดพลาดเพื่อดูรายละเอียดเพิ่มเติม" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: ไม่พบอีเมลพนักงาน ดังนั้นจึงยังไม่ได้ส่งอีเมล" diff --git a/hrms/locale/tr.po b/hrms/locale/tr.po index f0320d7fec..cac0f29b5f 100644 --- a/hrms/locale/tr.po +++ b/hrms/locale/tr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-09 15:37\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Turkish\n" "MIME-Version: 1.0\n" @@ -525,7 +525,7 @@ msgstr "Önceki ödeneklerden çalıştırman izinleri ekle" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "Önceki izin döneminin atamasından kullanılmayan izinleri bu atamaya ekle" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "Maaş yapısında vergi bileşeni olmadığı için, Maaş Bileşeni ana kaydından vergi bileşenleri eklendi." @@ -872,6 +872,12 @@ msgstr "Yıllık Tahsis Aşıldı" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Yıllık Maaş" @@ -1737,7 +1743,7 @@ msgstr "Bonus Ödeme Tarihi bir tarih olamaz" msgid "Branch: {0}" msgstr "Bölüm: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "Toplu Atamalar" @@ -1839,11 +1845,11 @@ msgstr "Vardiya Ataması: {0} Devamlılık: {1} ile bağlantılı olduğu için msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "Vardiya Ataması {0}, Personel Hareketi {1} ile bağlantılı olduğu için iptal edilemez" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "Maaş Bordrosu Döneminden Önce Ayrılan Çalışan için Maaş Bordrosu Oluşturulamaz" @@ -2302,7 +2308,7 @@ msgstr "Personelin Performans Geri Bildirimi ve Öz Değerlendirme sırasında d msgid "Currency " msgstr "Para Birimi" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "Seçilen Gelir Vergisi Diliminin para birimi {1} yerine {0} olmalıdır" @@ -3430,7 +3436,7 @@ msgstr "Personel {0}, bu dönem içinde çakışan aktif bir Vardiyaya ({1}: {2} msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "Personel {0} , bu dönem içinde çakışan {1}: {2} vardiyası için zaten başvuruda bulunmuştur" @@ -3458,7 +3464,7 @@ msgstr "{0} isimli Personel Eğitim Katılımcılarında bulunamadı." msgid "Employee {0} on Half day on {1}" msgstr "Personel {0}, {1} tarihinde yarım gün çalışacak" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3523,6 +3529,17 @@ msgstr "Hedefi Bulunmayan Personeller: {0}" msgid "Employees working on a holiday" msgstr "Tatilde Çalışan Personeller" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3676,7 +3693,8 @@ msgstr "{0} silinirken hata oluştu" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "Formülde veya koşulda hata var" @@ -3692,7 +3710,7 @@ msgstr "Bazı satırlarda hata var" msgid "Error updating {0}" msgstr "{0} Güncellenirken hata oluştu" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "{row_id}satırında {doctype} {doclink} değerlendirilirken hata oluştu.

Hata: {error}

İpucu: {description}" @@ -4421,7 +4439,7 @@ msgstr "Başlangıç Tarihi Bitiş Tarihinden önce olmalıdır" msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "{0} personelden çalışanın masrafından sonra tarih olamaz {1}" @@ -4429,7 +4447,7 @@ msgstr "{0} personelden çalışanın masrafından sonra tarih olamaz {1}" msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "{0} personelinin çalışanlardan {1} yayınlanmasından önce olamaz." @@ -5195,7 +5213,7 @@ msgstr "Gelir Vergisi Kesintileri" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5209,15 +5227,15 @@ msgstr "Gelir Vergisi Levhası" msgid "Income Tax Slab Other Charges" msgstr "Gelir Vergisi Levhası Diğer Masraflar" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 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:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "Gelir Vergisi Levhası, Bordro Dönemi Başlangıç Tarihi: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "Gelir Vergisi Levhası, Maaş Yapısı Atamasında belirlenmemiş: {0}" @@ -5225,7 +5243,7 @@ msgstr "Gelir Vergisi Levhası, Maaş Yapısı Atamasında belirlenmemiş: {0}" msgid "Income Tax Slab: " msgstr "Gelir Vergisi Dilimi: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "Gelir Vergisi Levhası: {0} devre dışı bırakıldı" @@ -5461,7 +5479,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5833,7 +5851,7 @@ msgstr "Anahtar Sorumluluk Alanı" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6250,7 +6268,7 @@ msgstr "{0} Türü Ayrılma özelliği değiştirilemez" msgid "Leave Without Pay" msgstr "Ücretsiz izin" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "Ödemesiz bırakma, mahremiyetler {} kayıtlarıyla eşleşmiyor" @@ -6737,11 +6755,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "Zorunlu Alan Eksik" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "" @@ -6753,7 +6771,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "" @@ -6826,7 +6844,8 @@ msgid "My Requests" msgstr "Taleplerim" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "İsim hatası" @@ -6854,7 +6873,7 @@ msgstr "Net Ücret (Şirket Para Birimi)" msgid "Net Pay Info" msgstr "Net Ödeme Bilgisi" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "Net Ücret az 0 olamaz" @@ -6985,7 +7004,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:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "veri tarihleri için çalışanlar {0} için bulunma aktif veya varsayılan Maaş Yapısı" @@ -7166,7 +7185,7 @@ msgstr "Not: Vardiya mevcut devamlılık kayıtlarının üzerine yazılmayacakt msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "Not: Toplam tahsis edilen izinler {0} , dönem için onaylanan izinlerden {1} daha az olmamalıdır" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "Not: Maaş bordronuz şifreyle korunmaktadır, PDF'i açmak için gereken şifre {0} formatındadır." @@ -7311,7 +7330,7 @@ msgstr "Tanıtım Aktiviteleri" msgid "Onboarding Begins On" msgstr "Tanıtım Başlangıcı" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "Bu İsteği Yalnızca Onaylayanlar Onaylayabilirim." @@ -7335,7 +7354,7 @@ msgstr "" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "Sadece sunulabilir 'Reddedildi' 'Onaylandı' ve statülü Uygulamaları bırakın" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "Yalnızca 'Onaylandı' ve 'Reddedildi' Durumunda Vardiya İsteği gönderilebilir" @@ -7429,7 +7448,7 @@ msgstr "" msgid "Overlapping Shift Attendance" msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "" @@ -7953,7 +7972,7 @@ msgstr "Lütfen önce Otomatik Devamlılığı etkinleştirin ve kurulumu tamaml msgid "Please Select Company First" msgstr "Lütfen Önce Firma Seçin" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -7997,7 +8016,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "Lütfen dosya ekini inceleyin" @@ -8124,7 +8143,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "Lütfen Bordro ayarlarına göre Bordro ayarı" @@ -8169,7 +8188,7 @@ msgstr "Lütfen tüm {0} için Değerlendirme Şablonunu ayarlayın veya aşağ msgid "Please set the Company" msgstr "Lütfen şirketi ayarlayın." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "Lütfen çalışan {0} için Katılma Tarihi'ni ayarlayın." @@ -8223,7 +8242,7 @@ msgstr "Eğitime geribildiriminizi 'Eğitim Geri Bildirimi' ve ardından msgid "Please specify the job applicant to be updated." msgstr "Lütfen güncellenecek iş başvurusu sahibini belirtiniz." -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "" @@ -8281,8 +8300,8 @@ msgstr "" msgid "Prevent self approval for leaves even if user has permissions" msgstr "" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "Maaş Bordrosu Önizleme" @@ -9156,11 +9175,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "çalışanın maaş Kuponu {0} zaten bu dönem için tahrik edilen" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "çalışanın maaş Kuponu {0} zaten zaman ayırmak için çalışanlar {1}" @@ -9233,7 +9252,7 @@ msgstr "Maaş Yapısı Atama" msgid "Salary Structure Assignment field" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "Çalışan için Maaş Yapısı Ataması zaten var" @@ -9241,7 +9260,7 @@ msgstr "Çalışan için Maaş Yapısı Ataması zaten var" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "Maaş Yapısı Eksik" @@ -9253,7 +9272,7 @@ msgstr "" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "" @@ -9307,7 +9326,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "Maaş bordrosu e-postaları gönderilmek üzere sıraya alınmıştır. Durum için {0} adresini kontrol edin." @@ -9712,7 +9731,7 @@ msgstr "Vardiya Atama Geçmişi" msgid "Shift Assignment Tool" msgstr "Vardiya Atama Aracı" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "Vardiya Ataması: {0} Çalışan için yayınladı: {1}" @@ -9920,7 +9939,7 @@ msgstr "Maaş Bordrosunda İzin Bakiyesini Göster" msgid "Show Leaves Of All Department Members In Calendar" msgstr "Takvimde Tüm Departman Üyelerinin Yapraklarını Göster" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "Göster Maaş Kayma" @@ -9932,7 +9951,7 @@ msgstr "Gösteriliyor" msgid "Sick Leave" msgstr "Hastalık İzni" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "Tek Görevlendirme" @@ -10041,7 +10060,7 @@ msgstr "Standart Vergi Muafiyeti Tutarı" msgid "Standard Working Hours" msgstr "Standart Çalışma Saatleri" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "Başlangıç ve bitiş süreleri geçerli bir Bordro Döneminde değil, {0} değeri hesaplayamaz." @@ -10185,7 +10204,8 @@ msgstr "Özet Görünüm" msgid "Sync {0}" msgstr "Senkronize Et {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "Söz dizimi hatası" @@ -10211,7 +10231,7 @@ msgstr "Vergi & Kazançlar" #. 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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "" @@ -10256,7 +10276,7 @@ msgstr "esnek fayda vergisi" #. 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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "" @@ -10403,7 +10423,7 @@ msgstr "Personel Girişinin devamlılık olarak kabul edildiği vardiya başlang msgid "Theory" msgstr "Teori" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "Bu aylık çalışma günlerinden daha fazla tatil vardır." @@ -10421,7 +10441,7 @@ msgstr "{0} kadro planında boş yer yok" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10451,15 +10471,18 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "Bu çalışanın zaten aynı zaman damgasına sahip bir günlüğü var. {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "Bu hata geçersiz formül veya koşuldan kaynaklanıyor olabilir." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "Bu hata geçersiz söz diziminden kaynaklanıyor olabilir." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "Bu hata eksik veya silinmiş bir alandan kaynaklanıyor olabilir." @@ -10914,7 +10937,7 @@ msgstr "Tüm {0} için toplam ağırlık 100'e kadar eklenmelidir. Şu anda %{1} msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "Toplam çalışma süresi maksimum çalışma saatleri fazla harcama {0}" @@ -11618,7 +11641,7 @@ msgstr "Telafi edici izin talebi gün arasında tüm gün (ler) mevcut değilsin msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "Varsayılan Vardiyanızı talep edemezsiniz: {0}" @@ -11638,6 +11661,10 @@ msgstr "Sadece JPG, PNG, PDF, TXT veya Microsoft belgelerini yükleyebilirsiniz. msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11814,7 +11841,7 @@ msgstr "{0} Eksik" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} Satır #{1}: Formül ayarlandı ancak Maaş Bileşeni {3} için {2} devre dışı bırakıldı." -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} Satır #{1}: {2} formülün dikkate alınması için etkinleştirilmesi gerekir." @@ -11901,7 +11928,7 @@ msgstr "" msgid "{0} must be submitted" msgstr "{0} gönderilmelidir" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} / {1} Tamamlandı" @@ -11937,7 +11964,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: Çalışanın e-posta adresi bulunamadığı için e-posta gönderilemedi" diff --git a/hrms/locale/vi.po b/hrms/locale/vi.po index 542d1c4fda..3325ae60f2 100644 --- a/hrms/locale/vi.po +++ b/hrms/locale/vi.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-08 15:41\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:55\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Vietnamese\n" "MIME-Version: 1.0\n" @@ -525,7 +525,7 @@ msgstr "Cộng ngày nghỉ chưa sử dụng từ kỳ trước" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "Cộng ngày nghỉ chưa sử dụng từ kỳ phân bổ nghỉ phép trước vào kỳ phân bổ này" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "Đã thêm thành phần thuế từ danh mục Thành phần lương vì cấu trúc lương không có thành phần thuế nào." @@ -872,6 +872,12 @@ msgstr "Phân bổ hàng năm đã vượt quá" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "Lương hàng năm" @@ -1737,7 +1743,7 @@ msgstr "Ngày thanh toán thưởng không thể là ngày trong quá khứ" msgid "Branch: {0}" msgstr "Chi nhánh: {0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "Phân bổ hàng loạt" @@ -1839,11 +1845,11 @@ msgstr "Không thể hủy Phân ca: {0} vì nó được liên kết với Ch msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "Không thể hủy Phân ca: {0} vì nó được liên kết với Checkin nhân viên: {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "Không thể tạo Phiếu lương cho Nhân viên vào sau Kỳ lương" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "Không thể tạo Phiếu lương cho Nhân viên đã nghỉ trước Kỳ lương" @@ -2305,7 +2311,7 @@ msgstr "Tiêu chí dựa trên đó nhân viên sẽ được đánh giá trong msgid "Currency " msgstr "Tiền tệ " -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "Tiền tệ của Bậc thuế thu nhập đã chọn phải là {0} thay vì {1}" @@ -3433,7 +3439,7 @@ msgstr "Nhân viên {0} đã có Ca đang hoạt động {1}: {2} trùng lập t msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "Nhân viên {0} đã gửi đơn {1} cho kỳ lương {2}" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "Nhân viên {0} đã nộp đơn xin Ca {1}: {2} trùng lập trong kỳ này" @@ -3461,7 +3467,7 @@ msgstr "Không tìm thấy nhân viên {0} trong Người tham dự sự kiện msgid "Employee {0} on Half day on {1}" msgstr "Nhân viên {0} nghỉ nửa ngày vào {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "Nhân viên {0} đã thôi việc vào {1} phải được đặt là 'Đã nghỉ'" @@ -3526,6 +3532,17 @@ msgstr "Nhân viên chưa có mục tiêu: {0}" msgid "Employees working on a holiday" msgstr "Nhân viên làm việc vào ngày lễ" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3679,7 +3696,8 @@ msgstr "Lỗi khi xóa {0}" msgid "Error downloading PDF" msgstr "Lỗi khi tải PDF" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "Lỗi trong công thức hoặc điều kiện" @@ -3695,7 +3713,7 @@ msgstr "Lỗi trong một số hàng" msgid "Error updating {0}" msgstr "Lỗi khi cập nhật {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "Lỗi khi đánh giá {doctype} {doclink} tại hàng {row_id}.

Lỗi: {error}

Gợi ý: {description}" @@ -4424,7 +4442,7 @@ msgstr "Từ ngày phải trước Đến ngày" msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "Từ ngày {0} không thể sau ngày kết thúc Kỳ lương {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "Từ ngày {0} không thể sau Ngày thôi việc của nhân viên {1}" @@ -4432,7 +4450,7 @@ msgstr "Từ ngày {0} không thể sau Ngày thôi việc của nhân viên {1} msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "Từ ngày {0} không thể trước ngày bắt đầu Kỳ lương {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "Từ ngày {0} không thể trước Ngày vào làm của nhân viên {1}" @@ -5198,7 +5216,7 @@ msgstr "Khấu trừ thuế thu nhập" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5212,15 +5230,15 @@ msgstr "Bậc thuế thu nhập" msgid "Income Tax Slab Other Charges" msgstr "Phí khác bậc thuế thu nhập" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "Bậc thuế thu nhập là bắt buộc vì Cấu trúc lương {0} có thành phần thuế {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "Bậc thuế thu nhập phải có hiệu lực vào hoặc trước Ngày bắt đầu Kỳ lương: {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "Bậc thuế thu nhập chưa được đặt trong Phân bổ cấu trúc lương: {0}" @@ -5228,7 +5246,7 @@ msgstr "Bậc thuế thu nhập chưa được đặt trong Phân bổ cấu tr msgid "Income Tax Slab: " msgstr "Bậc thuế thu nhập: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "Bậc thuế thu nhập: {0} bị vô hiệu hóa" @@ -5464,7 +5482,7 @@ msgstr "Số tiền phúc lợi không hợp lệ" msgid "Invalid Dates" msgstr "Ngày không hợp lệ" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "Ngày LWP được đảo ngược không hợp lệ" @@ -5836,7 +5854,7 @@ msgstr "Lĩnh vực trách nhiệm chính" msgid "Key Result Area" msgstr "Lĩnh vực kết quả chính" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "Ngày LWP đảo ngược ({0}) không khớp với tổng Điều chỉnh lương thực tế ({1}) cho nhân viên {2} từ {3} đến {4}" @@ -6253,7 +6271,7 @@ msgstr "Loại nghỉ phép {0} không thể thanh toán" msgid "Leave Without Pay" msgstr "Nghỉ phép không lương" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "Nghỉ phép không lương không khớp với bản ghi đã phê duyệt {}" @@ -6740,11 +6758,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "Thiếu tài khoản tạm ứng" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "Thiếu trường bắt buộc" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "Thiếu bản ghi mở đầu" @@ -6756,7 +6774,7 @@ msgstr "Thiếu ngày thôi việc" msgid "Missing Salary Components" msgstr "Thiếu thành phần lương" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "Thiếu bậc thuế" @@ -6829,7 +6847,8 @@ msgid "My Requests" msgstr "Yêu cầu của tôi" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "Lỗi tên" @@ -6857,7 +6876,7 @@ msgstr "Lương Ròng (Tiền Tệ Công Ty)" msgid "Net Pay Info" msgstr "Thông Tin Lương Ròng" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "Lương Ròng Không Thể Nhỏ Hơn 0" @@ -6988,7 +7007,7 @@ msgstr "Không Tìm Thấy Phân Bổ Cấu Trúc Lương Đang Hoạt Động C 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 "Không Tìm Thấy Nhân Viên Đang Hoạt Động Liên Kết Với ID Email {0}. Hãy Thử Đăng Nhập Bằng Email Nhân Viên Của Bạn Hoặc Liên Hệ Quản Lý HR Để Được Truy Cập." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "Không Tìm Thấy Cấu Trúc Lương Đang Hoạt Động Hoặc Mặc Định Cho Nhân Viên {0} Trong Các Ngày Đã Chỉ Định" @@ -7169,7 +7188,7 @@ msgstr "Lưu Ý: Ca Sẽ Không Bị Ghi Đè Trong Các Bản Ghi Chấm Công msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "Lưu Ý: Tổng Số Ngày Nghỉ Được Phân Bổ {0} Không Nên Ít Hơn Số Ngày Nghỉ Đã Duyệt {1} Trong Kỳ" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "Lưu Ý: Phiếu Lương Của Bạn Được Bảo Vệ Bằng Mật Khẩu, Mật Khẩu Để Mở File PDF Có Định Dạng {0}." @@ -7314,7 +7333,7 @@ msgstr "Hoạt Động Đào Tạo Nhân Viên Mới" msgid "Onboarding Begins On" msgstr "Đào Tạo Bắt Đầu Từ Ngày" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "Chỉ Người Phê Duyệt Mới Có Thể Phê Duyệt Yêu Cầu Này." @@ -7338,7 +7357,7 @@ msgstr "Chỉ Các Phỏng Vấn Có Trạng Thái Đạt Hoặc Từ Chối M msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "Chỉ Đơn Xin Nghỉ Phép Có Trạng Thái 'Đã Duyệt' Và 'Từ Chối' Mới Có Thể Được Xác Nhận" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "Chỉ Yêu Cầu Ca Với Trạng Thái 'Đã Duyệt' Và 'Từ Chối' Mới Có Thể Được Xác Nhận" @@ -7432,7 +7451,7 @@ msgstr "Yêu Cầu Chấm Công Trùng Lặp" msgid "Overlapping Shift Attendance" msgstr "Chấm Công Ca Trùng Lặp" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "Yêu Cầu Ca Trùng Lặp" @@ -7956,7 +7975,7 @@ msgstr "Vui Lòng Bật Chấm Công Tự Động Và Hoàn Thành Cài Đặt T msgid "Please Select Company First" msgstr "Vui Lòng Chọn Công Ty Trước" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "Vui Lòng Gán Cấu Trúc Lương Cho Nhân Viên {0} Có Hiệu Lực Từ Hoặc Trước {1} Trước" @@ -8000,7 +8019,7 @@ msgstr "Vui Lòng Điền Nhân Viên, Ngày Đăng, Và Công Ty Trước Khi L msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "Vui Lòng Giảm {0} Để Tránh Thời Gian Ca Trùng Lặp Với Chính Nó" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "Vui Lòng Xem Tệp Đính Kèm" @@ -8127,7 +8146,7 @@ msgstr "Vui Lòng Đặt Thành Phần Thu Nhập Cho Loại Nghỉ: {0}." msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "Vui Lòng Đặt Lương Dựa Trên Trong Cài Đặt Lương" @@ -8172,7 +8191,7 @@ msgstr "Vui Lòng Đặt Mẫu Đánh Giá Cho Tất Cả {0} Hoặc Chọn Mẫ msgid "Please set the Company" msgstr "Vui Lòng Đặt Công Ty" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "Vui Lòng Đặt Ngày Vào Làm Cho Nhân Viên {0}" @@ -8226,7 +8245,7 @@ msgstr "Vui Lòng Chia Sẻ Phản Hồi Của Bạn Về Đào Tạo Bằng Cá msgid "Please specify the job applicant to be updated." msgstr "Vui Lòng Chỉ Định Ứng Viên Cần Cập Nhật." -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "Vui Lòng Chỉ Định {0} Và {1} (Nếu Có), Để Tính Thuế Chính Xác Trong Các Phiếu Lương Tương Lai." @@ -8284,8 +8303,8 @@ msgstr "Ngăn Chặn Phê Duyệt Chi Phí Của Chính Mình Ngay Cả Khi Ngư msgid "Prevent self approval for leaves even if user has permissions" msgstr "Ngăn Chặn Phê Duyệt Nghỉ Phép Của Chính Mình Ngay Cả Khi Người Dùng Có Quyền" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "Xem Trước Phiếu Lương" @@ -9159,11 +9178,11 @@ msgstr "Việc tạo phiếu lương đang được xếp hàng. Có thể mất msgid "Salary Slip not found." msgstr "Không tìm thấy phiếu lương." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "Phiếu lương của nhân viên {0} đã được tạo cho kỳ này" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "Phiếu lương của nhân viên {0} đã được tạo cho bảng chấm công {1}" @@ -9236,7 +9255,7 @@ msgstr "Phân bổ cấu trúc lương" msgid "Salary Structure Assignment field" msgstr "Trường phân bổ cấu trúc lương" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "Phân bổ cấu trúc lương cho nhân viên đã tồn tại" @@ -9244,7 +9263,7 @@ msgstr "Phân bổ cấu trúc lương cho nhân viên đã tồn tại" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "Không tìm thấy phân bổ cấu trúc lương cho nhân viên {0} vào ngày {1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "Thiếu cấu trúc lương" @@ -9256,7 +9275,7 @@ msgstr "Cấu trúc lương phải được nộp trước khi nộp {0}" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "Cấu trúc lương chưa được phân bổ cho nhân viên {0} cho ngày {1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "Cấu trúc lương {0} không thuộc về công ty {1}" @@ -9310,7 +9329,7 @@ msgstr "Các thành phần lương loại Quỹ Tổ Quốc, Quỹ Tổ Quốc B msgid "Salary components should be part of the Salary Structure." msgstr "Các thành phần lương phải là một phần của Cấu trúc lương." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "Email phiếu lương đã được xếp hàng để gửi. Kiểm tra {0} để biết trạng thái." @@ -9715,7 +9734,7 @@ msgstr "Lịch sử phân ca" msgid "Shift Assignment Tool" msgstr "Công cụ phân ca" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "Phân ca: {0} đã được tạo cho nhân viên: {1}" @@ -9923,7 +9942,7 @@ msgstr "Hiển thị số dư nghỉ phép trong phiếu lương" msgid "Show Leaves Of All Department Members In Calendar" msgstr "Hiển thị nghỉ phép của tất cả thành viên phòng ban trong lịch" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "Hiển thị phiếu lương" @@ -9935,7 +9954,7 @@ msgstr "Hiển thị" msgid "Sick Leave" msgstr "Nghỉ ốm" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "Phân bổ đơn" @@ -10044,7 +10063,7 @@ msgstr "Số tiền miễn thuế tiêu chuẩn" msgid "Standard Working Hours" msgstr "Giờ làm việc tiêu chuẩn" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "Ngày bắt đầu và kết thúc không nằm trong kỳ lương hợp lệ, không thể tính {0}." @@ -10188,7 +10207,8 @@ msgstr "Xem tóm tắt" msgid "Sync {0}" msgstr "Đồng bộ {0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "Lỗi cú pháp" @@ -10214,7 +10234,7 @@ msgstr "Thuế & Phúc lợi" #. 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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "Thuế đã khấu trừ đến ngày" @@ -10259,7 +10279,7 @@ msgstr "Thuế trên phúc lợi linh hoạt" #. 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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "Thu nhập chịu thuế đến ngày" @@ -10406,7 +10426,7 @@ msgstr "Thời gian trước giờ bắt đầu ca mà Employee Check-in đượ msgid "Theory" msgstr "Lý thuyết" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "Có nhiều ngày lễ hơn ngày làm việc trong tháng này." @@ -10424,7 +10444,7 @@ msgstr "Không có vị trí trống trong kế hoạch nhân sự {0}" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "Không có Cấu trúc lương được phân bổ cho {0}. Trước tiên hãy phân bổ Cấu trúc lương." @@ -10454,15 +10474,18 @@ msgstr "Ngày nghỉ bù này sẽ có hiệu lực từ {0}." msgid "This employee already has a log with the same timestamp.{0}" msgstr "Nhân viên này đã có log với cùng thời gian.{0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "Lỗi này có thể do công thức hoặc điều kiện không hợp lệ." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "Lỗi này có thể do cú pháp không hợp lệ." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "Lỗi này có thể do trường bị thiếu hoặc đã xóa." @@ -10917,7 +10940,7 @@ msgstr "Tổng trọng số cho tất cả {0} phải bằng 100. Hiện tại l msgid "Total working Days Per Year" msgstr "Tổng số ngày làm việc mỗi năm" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "Tổng số giờ làm việc không nên lớn hơn số giờ làm việc tối đa {0}" @@ -11621,7 +11644,7 @@ msgstr "Bạn không có mặt đủ ngày giữa các ngày yêu cầu nghỉ b msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "Bạn không thể định nghĩa nhiều bậc nếu bạn có bậc không có giới hạn trên và dưới." -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "Bạn không thể yêu cầu ca mặc định của bạn: {0}" @@ -11641,6 +11664,10 @@ msgstr "Bạn chỉ có thể tải lên tài liệu JPG, PNG, PDF, TXT hoặc M msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "Bạn không thể đảo ngược nhiều hơn tổng số ngày LWP {0}. Bạn đã đảo ngược {1} ngày cho nhân viên này." +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11817,7 +11844,7 @@ msgstr "Thiếu {0}" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} Dòng #{1}: Công Thức Đã Được Đặt Nhưng {2} Bị Vô Hiệu Hóa Cho Thành Phần Lương {3}." -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} Dòng #{1}: {2} Cần Được Bật Để Công Thức Được Xem Xét." @@ -11904,7 +11931,7 @@ msgstr "{0} Ngày Nghỉ Đã Được Phân Bổ Thủ Công Bởi {1} Vào {2} msgid "{0} must be submitted" msgstr "{0} Phải Được Xác Nhận" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "{0} Của {1} Đã Hoàn Thành" @@ -11940,7 +11967,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "{0}. Kiểm Tra Nhật Ký Lỗi Để Biết Thêm Chi Tiết." -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}: Không Tìm Thấy Email Nhân Viên, Do Đó Email Không Được Gửi" diff --git a/hrms/locale/zh.po b/hrms/locale/zh.po index 055f4a6964..f34ce29c96 100644 --- a/hrms/locale/zh.po +++ b/hrms/locale/zh.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-06-07 10:18+0000\n" -"PO-Revision-Date: 2026-06-09 15:37\n" +"POT-Creation-Date: 2026-06-14 10:34+0000\n" +"PO-Revision-Date: 2026-06-15 18:54\n" "Last-Translator: contact@frappe.io\n" "Language-Team: Chinese Simplified\n" "MIME-Version: 1.0\n" @@ -525,7 +525,7 @@ msgstr "添加上次未使用假期" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "将上一假期周期未使用的假期添加至本次分配" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1686 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1675 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "薪资结构未配置税费组件，已自动从主薪资组件中添加税费项" @@ -872,6 +872,12 @@ msgstr "超出年度分配额度" msgid "Annual CTC" msgstr "" +#. Label of the annual_gross_earning (Currency) field in DocType 'Salary +#. Structure Assignment' +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json +msgid "Annual Gross Earning" +msgstr "" + #: hrms/setup.py:410 msgid "Annual Salary" msgstr "年薪" @@ -1737,7 +1743,7 @@ msgstr "奖金发放日期不能为过去日期" msgid "Branch: {0}" msgstr "分支机构：{0}" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:131 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:137 msgid "Bulk Assignments" msgstr "批量分配" @@ -1839,11 +1845,11 @@ msgstr "无法取消班次分配{0}，因其关联考勤记录{1}" msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "无法取消班次分配{0}，因其关联员工签到{1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:390 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:380 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "无法为薪资周期后入职员工创建工资条" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:393 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:383 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "无法为薪资周期前离职员工创建工资条" @@ -2305,7 +2311,7 @@ msgstr "绩效反馈与自评的评分依据标准" msgid "Currency " msgstr "币种" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:163 msgid "Currency of selected Income Tax Slab should be {0} instead of {1}" msgstr "所选所得税税级的币种应为{0}而非{1}" @@ -3433,7 +3439,7 @@ msgstr "员工{0}存在活动班次{1}:{2}与本期间重叠" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "员工{0}已提交薪资期间{2}的申请{1}" -#: hrms/hr/doctype/shift_request/shift_request.py:148 +#: hrms/hr/doctype/shift_request/shift_request.py:149 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "员工{0}已申请与本期间重叠的班次{1}:{2}" @@ -3461,7 +3467,7 @@ msgstr "未在培训参与者中找到员工{0}" msgid "Employee {0} on Half day on {1}" msgstr "员工{0}在{1}为半日假" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:732 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:738 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "员工{0}于{1}离职需标记为'已离职'" @@ -3526,6 +3532,17 @@ msgstr "未设置目标员工：{0}" msgid "Employees working on a holiday" msgstr "节假日工作员工" +#. Option for the 'Type' (Select) field in DocType 'Salary Component' +#: hrms/payroll/doctype/salary_component/salary_component.json +msgid "Employer Contribution" +msgstr "" + +#. Label of the employer_contributions (Table) field in DocType 'Salary +#. Structure' +#: hrms/payroll/doctype/salary_structure/salary_structure.json +msgid "Employer Contributions" +msgstr "" + #. Label of the employment_type (Link) field in DocType 'Employee Attendance #. Tool' #. Name of a DocType @@ -3679,7 +3696,8 @@ msgstr "删除{0}时出错" msgid "Error downloading PDF" msgstr "下载 PDF 时出错" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1397 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:400 msgid "Error in formula or condition" msgstr "公式或条件错误" @@ -3695,7 +3713,7 @@ msgstr "部分行数据错误" msgid "Error updating {0}" msgstr "更新{0}时出错" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2640 +#: hrms/payroll/utils.py:134 msgid "Error while evaluating the {doctype} {doclink} at row {row_id}.

Error: {error}

Hint: {description}" msgstr "评估{doctype}{doclink}第{row_id}行时出错。

错误：{error}

提示：{description}" @@ -4424,7 +4442,7 @@ msgstr "起始日期必须早于截止日期" msgid "From Date {0} cannot be after Payroll Period end date {1}" msgstr "起始日期{0}不能晚于薪资期间结束日期{1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:93 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:128 msgid "From Date {0} cannot be after employee's relieving Date {1}" msgstr "起始日期{0}不能晚于员工离职日期{1}" @@ -4432,7 +4450,7 @@ msgstr "起始日期{0}不能晚于员工离职日期{1}" msgid "From Date {0} cannot be before Payroll Period start date {1}" msgstr "起始日期{0}不能早于薪资期间开始日期{1}" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:85 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:120 msgid "From Date {0} cannot be before employee's joining Date {1}" msgstr "起始日期{0}不能早于员工入职日期{1}" @@ -5198,7 +5216,7 @@ msgstr "所得税扣除项" #. 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:142 +#: 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:623 #: hrms/payroll/workspace/payroll/payroll.json @@ -5212,15 +5230,15 @@ msgstr "所得税税级" msgid "Income Tax Slab Other Charges" msgstr "所得税税级其他费用" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:113 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:148 msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "薪资结构{0}包含税费组件{1}，必须设置所得税税级" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1963 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1952 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "所得税税级生效日期不得晚于薪资周期开始日期{0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1951 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1940 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "薪资结构分配{0}未设置所得税税级" @@ -5228,7 +5246,7 @@ msgstr "薪资结构分配{0}未设置所得税税级" msgid "Income Tax Slab: " msgstr "所得税税级: " -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1948 msgid "Income Tax Slab: {0} is disabled" msgstr "所得税税级{0}已禁用" @@ -5464,7 +5482,7 @@ msgstr "无效福利金额" msgid "Invalid Dates" msgstr "无效日期" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2672 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2642 msgid "Invalid LWP Days Reversed" msgstr "无效LWP天数冲销" @@ -5836,7 +5854,7 @@ msgstr "关键责任区" msgid "Key Result Area" msgstr "关键成果领域" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2639 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "员工{2}从{3}到{4}的LWP天数冲销（{0}）与实际薪资调整总额（{1}）不匹配" @@ -6253,7 +6271,7 @@ msgstr "假期类型{0}不可折现" msgid "Leave Without Pay" msgstr "无薪假" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:597 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:603 msgid "Leave Without Pay does not match with approved {} records" msgstr "无薪假与已批准的{}记录不符" @@ -6740,11 +6758,11 @@ msgstr "" msgid "Missing Advance Account" msgstr "缺少预支账户" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:119 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:154 msgid "Missing Mandatory Field" msgstr "缺少必填字段" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:201 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:236 msgid "Missing Opening Entries" msgstr "缺少期初分录" @@ -6756,7 +6774,7 @@ msgstr "缺失离职日期" msgid "Missing Salary Components" msgstr "缺少工资组件" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1954 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1943 msgid "Missing Tax Slab" msgstr "缺失税级" @@ -6829,7 +6847,8 @@ msgid "My Requests" msgstr "我的申请" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1394 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1383 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:386 msgid "Name error" msgstr "名称错误" @@ -6857,7 +6876,7 @@ msgstr "净工资（公司币种）" msgid "Net Pay Info" msgstr "净工资信息" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:293 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:283 msgid "Net Pay cannot be less than 0" msgstr "净工资不能小于零" @@ -6988,7 +7007,7 @@ msgstr "未找到员工{0}在欠薪起始日期{2}或之后有效的薪资结构 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 "未找到与邮箱ID {0}关联的有效员工，请使用员工邮箱登录或联系HR获取权限" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:523 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:516 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "员工{0}在指定日期范围内未找到有效或默认薪资结构" @@ -7169,7 +7188,7 @@ msgstr "注意：现有考勤记录中的班次不会被覆盖" msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "注意：期间总分配假期{0}不得少于已批准假期{1}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "注意：工资条PDF密码格式为{0}" @@ -7314,7 +7333,7 @@ msgstr "入职活动" msgid "Onboarding Begins On" msgstr "入职流程开始日期" -#: hrms/hr/doctype/shift_request/shift_request.py:115 +#: hrms/hr/doctype/shift_request/shift_request.py:116 msgid "Only Approvers can Approve this Request." msgstr "仅审批人可批准此请求" @@ -7338,7 +7357,7 @@ msgstr "仅通过或拒绝状态的面试可提交" msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted" msgstr "仅'已批准'或'已拒绝'状态的请假申请可提交" -#: hrms/hr/doctype/shift_request/shift_request.py:66 +#: hrms/hr/doctype/shift_request/shift_request.py:67 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted" msgstr "仅'已批准'或'已拒绝'状态的班次申请可提交" @@ -7432,7 +7451,7 @@ msgstr "重叠考勤申请" msgid "Overlapping Shift Attendance" msgstr "重叠班次考勤" -#: hrms/hr/doctype/shift_request/shift_request.py:156 +#: hrms/hr/doctype/shift_request/shift_request.py:157 msgid "Overlapping Shift Requests" msgstr "重叠班次申请" @@ -7956,7 +7975,7 @@ msgstr "请先启用自动考勤并完成设置" msgid "Please Select Company First" msgstr "请先选择公司" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:920 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:907 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "请先为员工{0}分配自{1}或之前生效的薪资结构" @@ -8000,7 +8019,7 @@ msgstr "请在获取加班明细前填写员工、过账日期和公司。" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "请调整{0}以避免班次时间重叠" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2252 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2241 msgid "Please see attachment" msgstr "请查看附件" @@ -8127,7 +8146,7 @@ msgstr "请为假期类型{0}设置收入组件" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:581 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:587 msgid "Please set Payroll based on in Payroll settings" msgstr "请在薪资设置中选择薪资计算依据" @@ -8172,7 +8191,7 @@ msgstr "请为所有{0}设置考核模板，或在下方员工表中选择模板 msgid "Please set the Company" msgstr "请设置公司" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:386 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:376 msgid "Please set the Date Of Joining for employee {0}" msgstr "请设置员工{0}的入职日期" @@ -8226,7 +8245,7 @@ msgstr "请点击'培训反馈'后点击'新建'提交反馈" msgid "Please specify the job applicant to be updated." msgstr "请指定要更新的职位申请人" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:192 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:227 msgid "Please specify {0} and {1} (if any), for the correct tax calculation in future salary slips." msgstr "请填写{0}及{1}(如有)，以确保未来工资条正确计税" @@ -8284,8 +8303,8 @@ msgstr "即使用户具有权限，也阻止费用报销的自我审批" msgid "Prevent self approval for leaves even if user has permissions" msgstr "即使有权限也禁止自我审批假期" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:155 -#: hrms/payroll/doctype/salary_structure/salary_structure.js:193 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:161 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:199 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js:89 msgid "Preview Salary Slip" msgstr "预览工资条" @@ -9159,11 +9178,11 @@ msgstr "工资条创建已加入队列，可能需要几分钟" msgid "Salary Slip not found." msgstr "未找到工资条。" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:420 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:410 msgid "Salary Slip of employee {0} already created for this period" msgstr "员工{0}的工资条已在本周期创建" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:426 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:416 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "员工{0}的工资条已关联工时表{1}" @@ -9236,7 +9255,7 @@ msgstr "薪资结构分配" msgid "Salary Structure Assignment field" msgstr "薪资结构分配字段" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:80 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:115 msgid "Salary Structure Assignment for Employee already exists" msgstr "员工薪资结构分配已存在" @@ -9244,7 +9263,7 @@ msgstr "员工薪资结构分配已存在" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "未找到员工{0}在日期{1}的薪资结构分配" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:526 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:519 msgid "Salary Structure Missing" msgstr "缺失薪资结构" @@ -9256,7 +9275,7 @@ msgstr "提交{0}前需先提交薪资结构" msgid "Salary Structure not assigned for employee {0} for date {1}" msgstr "员工{0}在日期{1}未分配薪资结构" -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:104 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:139 msgid "Salary Structure {0} does not belong to company {1}" msgstr "薪资结构{0}不属于公司{1}" @@ -9310,7 +9329,7 @@ msgstr "未设置公积金、附加公积金或公积金贷款类型的工资组 msgid "Salary components should be part of the Salary Structure." msgstr "薪资组件应属于薪资结构的一部分" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2736 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2662 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "工资条邮件已加入发送队列，查看{0}了解状态" @@ -9715,7 +9734,7 @@ msgstr "班次分配历史" msgid "Shift Assignment Tool" msgstr "班次分配工具" -#: hrms/hr/doctype/shift_request/shift_request.py:81 +#: hrms/hr/doctype/shift_request/shift_request.py:82 msgid "Shift Assignment: {0} created for Employee: {1}" msgstr "已为员工{1}创建班次分配{0}" @@ -9923,7 +9942,7 @@ msgstr "工资条显示假期余额" msgid "Show Leaves Of All Department Members In Calendar" msgstr "日历显示部门全体成员假期" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:204 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:210 msgid "Show Salary Slip" msgstr "显示工资条" @@ -9935,7 +9954,7 @@ msgstr "显示中" msgid "Sick Leave" msgstr "病假" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:120 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:126 msgid "Single Assignment" msgstr "单次分配" @@ -10044,7 +10063,7 @@ msgstr "标准免税额度" msgid "Standard Working Hours" msgstr "标准工时" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1890 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1879 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "起止日期不在有效薪资周期内，无法计算{0}" @@ -10188,7 +10207,8 @@ msgstr "汇总视图" msgid "Sync {0}" msgstr "同步{0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1390 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:393 msgid "Syntax error" msgstr "语法错误" @@ -10214,7 +10234,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:196 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:231 msgid "Tax Deducted Till Date" msgstr "截至当前已扣税款" @@ -10259,7 +10279,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:195 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:230 msgid "Taxable Earnings Till Date" msgstr "截至当前应税收入" @@ -10406,7 +10426,7 @@ msgstr "班次开始前允许签到的时间范围" msgid "Theory" msgstr "理论" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:578 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:584 msgid "There are more holidays than working days this month." msgstr "本月节假日多于工作日" @@ -10424,7 +10444,7 @@ msgstr "人员配置计划{0}下无空缺岗位" #: hrms/payroll/doctype/additional_salary/additional_salary.py:82 #: hrms/payroll/doctype/employee_incentive/employee_incentive.py:39 -#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:241 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:457 msgid "There is no Salary Structure assigned to {0}. First assign a Salary Structure." msgstr "" @@ -10454,15 +10474,18 @@ msgstr "本补休假自{0}起生效" msgid "This employee already has a log with the same timestamp.{0}" msgstr "该员工已有相同时间戳记录{0}" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1409 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1398 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:401 msgid "This error can be due to invalid formula or condition." msgstr "可能由无效公式或条件导致" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1402 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1391 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:394 msgid "This error can be due to invalid syntax." msgstr "可能由语法错误导致" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1395 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1384 +#: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:387 msgid "This error can be due to missing or deleted field." msgstr "可能由字段缺失或删除导致" @@ -10917,7 +10940,7 @@ msgstr "所有{0}的总权重必须为100%。当前为{1}%" msgid "Total working Days Per Year" msgstr "年总工作日数" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:263 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:253 msgid "Total working hours should not be greater than max working hours {0}" msgstr "总工时不可超过最大工时{0}" @@ -11621,7 +11644,7 @@ msgstr "调休申请日期间您未全天出勤" msgid "You can not define multiple slabs if you have a slab with no lower and upper limits." msgstr "存在无上下限的税率段时不可定义多个税率段" -#: hrms/hr/doctype/shift_request/shift_request.py:102 +#: hrms/hr/doctype/shift_request/shift_request.py:103 msgid "You can not request for your Default Shift: {0}" msgstr "不可申请默认班次{0}" @@ -11641,6 +11664,10 @@ msgstr "仅可上传JPG、PNG、PDF、TXT或Microsoft文档" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "您不能冲销超过总LWP天数{0}。您已为该员工冲销{1}天。" +#: hrms/hr/doctype/shift_request/shift_request.py:165 +msgid "You do not have permission to change the Status of a Shift Request." +msgstr "" + #: hrms/hr/doctype/leave_allocation/leave_allocation.py:458 #: hrms/hr/doctype/leave_allocation/leave_allocation.py:621 msgid "You do not have permission to complete this action" @@ -11817,7 +11844,7 @@ msgstr "缺失{0}" msgid "{0} Row #{1}: Formula is set but {2} is disabled for the Salary Component {3}." msgstr "{0} 行#{1}：已设置公式但薪资组件{3}的{2}未启用" -#: hrms/payroll/doctype/salary_structure/salary_structure.js:319 +#: hrms/payroll/doctype/salary_structure/salary_structure.js:325 msgid "{0} Row #{1}: {2} needs to be enabled for the formula to be considered." msgstr "{0} 行#{1}：需启用{2}才能使公式生效" @@ -11904,7 +11931,7 @@ msgstr "{1}于{2}手动分配了{0}天假期" msgid "{0} must be submitted" msgstr "必须提交{0}" -#: hrms/hr/doctype/goal/goal.py:221 +#: hrms/hr/doctype/goal/goal.py:223 msgid "{0} of {1} Completed" msgstr "已完成{1}中的{0}" @@ -11940,7 +11967,7 @@ msgstr "{0} {1} {2}?" msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2286 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2275 msgid "{0}: Employee email not found, hence email not sent" msgstr "{0}：未找到员工邮箱，邮件未发送" diff --git a/hrms/patches/post_install/move_payroll_setting_separately_from_hr_settings.py b/hrms/patches/post_install/move_payroll_setting_separately_from_hr_settings.py index 37a3c357b3..5091ba0180 100644 --- a/hrms/patches/post_install/move_payroll_setting_separately_from_hr_settings.py +++ b/hrms/patches/post_install/move_payroll_setting_separately_from_hr_settings.py @@ -3,27 +3,30 @@ import frappe +from frappe.query_builder import DocType def execute(): - data = frappe.db.sql( - """SELECT * - FROM `tabSingles` - WHERE - doctype = "HR Settings" - AND - field in ( - "encrypt_salary_slips_in_emails", - "email_salary_slip_to_employee", - "daily_wages_fraction_for_half_day", - "disable_rounded_total", - "include_holidays_in_total_working_days", - "max_working_hours_against_timesheet", - "payroll_based_on", - "password_policy" - ) - """, - as_dict=1, + singles = DocType("Singles") + data = ( + frappe.qb.from_(singles) + .select("*") + .where(singles.doctype == "HR Settings") + .where( + singles.field.isin( + [ + "encrypt_salary_slips_in_emails", + "email_salary_slip_to_employee", + "daily_wages_fraction_for_half_day", + "disable_rounded_total", + "include_holidays_in_total_working_days", + "max_working_hours_against_timesheet", + "payroll_based_on", + "password_policy", + ] + ) + ) + .run(as_dict=True) ) for d in data: diff --git a/hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py b/hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py index 39ea6795f9..68fdaafc11 100644 --- a/hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py +++ b/hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py @@ -344,14 +344,15 @@ def _get_component_eval_context(self) -> frappe._dict: data = get_component_eval_context(self.employee, self.as_dict()) - # Full-cycle / preview seeding: SSA has no attendance, so it evaluates as a - # full period -- payment_days == total_working_days (proration ratio 1) and no - # LWP -- so formulas referencing slip-runtime fields resolve and yield - # full-cycle values. Compute the period day-count the same way the salary - # slip's for_preview does (days in the period containing from_date). + # The SSA has no salary slip, so formulas referencing slip period fields (e.g. + # start_date) would raise NameError. Seed a full cycle -- the period containing + # from_date -- with no LWP/absence so proration-based formulas yield full-cycle + # values (payment_days == total_working_days, ratio 1). frequency = frappe.get_cached_value("Salary Structure", self.salary_structure, "payroll_frequency") dates = get_start_end_dates(frequency, self.from_date, self.company) period_days = date_diff(dates.end_date, dates.start_date) + 1 + data.start_date = dates.start_date + data.end_date = dates.end_date data.payment_days = period_days data.total_working_days = period_days data.leave_without_pay = 0 diff --git a/hrms/payroll/doctype/salary_structure_assignment/test_salary_structure_assignment.py b/hrms/payroll/doctype/salary_structure_assignment/test_salary_structure_assignment.py index ab7d2ee0c9..0d3a7a3185 100644 --- a/hrms/payroll/doctype/salary_structure_assignment/test_salary_structure_assignment.py +++ b/hrms/payroll/doctype/salary_structure_assignment/test_salary_structure_assignment.py @@ -87,6 +87,44 @@ def test_get_evaluated_components_does_not_mutate_cached_structure(self): cached = frappe.get_cached_doc("Salary Structure", "SSA Test Cache Structure") self.assertTrue(all(not r.get("default_amount") for r in cached.earnings)) + def test_get_evaluated_components_resolves_salary_slip_fields(self): + """A component formula may reference any salary slip field (e.g. start_date), + since the slip evaluates formulas against its own as_dict. SSA evaluation has + no slip, so it must mirror a full-cycle preview slip's field set; otherwise the + formula raises a NameError on the missing slip field.""" + emp = make_employee("ssa_slip_field@test.com", company="_Test Company") + + # formula references start_date -- a salary-slip field, absent from the SSA itself + formula = "base * getdate(start_date).month" + _make_component( + "SSA Test Period Bonus", "SSATPB", "Earning", amount_based_on_formula=1, formula=formula + ) + earnings = [ + { + "salary_component": "SSA Test Period Bonus", + "abbr": "SSATPB", + "amount_based_on_formula": 1, + "formula": formula, + }, + ] + + make_salary_structure( + "SSA Test Slip Field Structure", + "Monthly", + employee=emp, + company="_Test Company", + base=1000, + earnings=earnings, + deductions=[], + ) + ssa = frappe.get_last_doc("Salary Structure Assignment", filters={"employee": emp}) + + # full-cycle start_date is the first of the SSA's from_date month, so the + # component resolves to base * that month (proving start_date was seeded correctly) + expected = 1000 * get_first_day(ssa.from_date).month + components = {r.salary_component: r.default_amount for r in ssa.get_evaluated_components().earnings} + self.assertEqual(components["SSA Test Period Bonus"], expected) + def test_do_not_include_in_total_earning_is_in_ctc_but_not_gross(self): """A 'Do Not Include in Total' earning is part of CTC but not payable - it must be excluded from annual_gross_earning yet included in ctc.""" diff --git a/hrms/tests/test_utils.py b/hrms/tests/test_utils.py index a1e44700f2..7a3fc6b3a4 100644 --- a/hrms/tests/test_utils.py +++ b/hrms/tests/test_utils.py @@ -86,7 +86,12 @@ def add_date_to_holiday_list(date: str, holiday_list: str, is_half_day: bool = 0 holiday_list.save() -def create_company(name: str = "_Test Company", is_group: 0 | 1 = 0, parent_company: str | None = None): +def create_company( + name: str = "_Test Company", + is_group: 0 | 1 = 0, + parent_company: str | None = None, + abbr: str | None = None, +): if frappe.db.exists("Company", name): return frappe.get_doc("Company", name) @@ -94,6 +99,7 @@ def create_company(name: str = "_Test Company", is_group: 0 | 1 = 0, parent_comp { "doctype": "Company", "company_name": name, + "abbr": abbr, "default_currency": "INR", "country": "India", "is_group": is_group,