Merge branch 'frappe:develop' into fixes-new

Author: AyshaHakeem

frontend/src/views/attendance/AttendanceRequestList.vue

@@ -12,6 +12,9 @@
 <script setup>
 import { IonPage } from "@ionic/vue"
 import ListView from "@/components/ListView.vue"
+import { inject } from "vue"
+
+const __ = inject("$translate")
 
 const ATTENDANCE_REQUEST_FIELDS = ["name", "reason", "from_date", "to_date", "docstatus"]
 const FILTER_CONFIG = [

frontend/src/views/attendance/EmployeeCheckinList.vue

@@ -12,6 +12,9 @@
 <script setup>
 import { IonPage } from "@ionic/vue"
 import ListView from "@/components/ListView.vue"
+import { inject } from "vue"
+
+const __ = inject("$translate")
 
 const EMPLOYEE_CHECKIN_FIELDS = ["name", "log_type", "time", "latitude", "longitude"]
 

hrms/hr/doctype/employee_advance/employee_advance.py

@@ -32,7 +32,7 @@ def validate(self):
 		self.set_pending_amount()
 
 	def on_cancel(self):
-		self.ignore_linked_doctypes = "GL Entry"
+		self.ignore_linked_doctypes = ("GL Entry", "Payment Ledger Entry")
 		self.check_linked_payment_entry()
 		self.set_status(update=True)
 

hrms/hr/report/vehicle_expenses/vehicle_expenses.js

@@ -9,6 +9,20 @@ frappe.query_reports["Vehicle Expenses"] = {
 			options: ["Fiscal Year", "Date Range"],
 			default: ["Fiscal Year"],
 			reqd: 1,
+			on_change: () => {
+				let filter_based_on = frappe.query_report.get_filter_value("filter_based_on");
+
+				if (filter_based_on == "Fiscal Year") {
+					set_reqd_filter("fiscal_year", true);
+					set_reqd_filter("from_date", false);
+					set_reqd_filter("to_date", false);
+				}
+				if (filter_based_on == "Date Range") {
+					set_reqd_filter("fiscal_year", false);
+					set_reqd_filter("from_date", true);
+					set_reqd_filter("to_date", true);
+				}
+			},
 		},
 		{
 			fieldname: "fiscal_year",
@@ -17,21 +31,18 @@ frappe.query_reports["Vehicle Expenses"] = {
 			options: "Fiscal Year",
 			default: frappe.defaults.get_user_default("fiscal_year"),
 			depends_on: "eval: doc.filter_based_on == 'Fiscal Year'",
-			reqd: 1,
 		},
 		{
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			reqd: 1,
 			depends_on: "eval: doc.filter_based_on == 'Date Range'",
 			default: frappe.datetime.add_months(frappe.datetime.nowdate(), -12),
 		},
 		{
 			fieldname: "to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			reqd: 1,
 			depends_on: "eval: doc.filter_based_on == 'Date Range'",
 			default: frappe.datetime.nowdate(),
 		},
@@ -49,3 +60,9 @@ frappe.query_reports["Vehicle Expenses"] = {
 		},
 	],
 };
+
+function set_reqd_filter(fieldname, is_reqd) {
+	let filter = frappe.query_report.get_filter(fieldname);
+	filter.df.reqd = is_reqd;
+	filter.refresh();
+}

hrms/locale/es.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2024-11-10 09:33+0000\n"
-"PO-Revision-Date: 2024-11-11 18:36\n"
+"PO-Revision-Date: 2024-11-16 19:39\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -275,7 +275,7 @@ msgstr ""
 #. Header text in the HR Workspace
 #: hrms/hr/workspace/hr/hr.json
 msgid "<span class=\"h4\"><b>Reports &amp; Masters</b></span>"
-msgstr ""
+msgstr "<span class=\"h4\"><b>Informes &amp; Datos Maestros</b></span>"
 
 #. Header text in the Salary Payout Workspace
 #: hrms/payroll/workspace/salary_payout/salary_payout.json
@@ -302,7 +302,7 @@ msgstr ""
 #: hrms/payroll/workspace/salary_payout/salary_payout.json
 #: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json
 msgid "<span class=\"h4\"><b>Your Shortcuts</b></span>"
-msgstr ""
+msgstr "<span class=\"h4\"><b>Tus accesos directos</b></span>"
 
 #. Header text in the Shift & Attendance Workspace
 #: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json
@@ -3005,7 +3005,7 @@ msgstr "Cliente"
 #. Option for the 'Roster Color' (Select) field in DocType 'Shift Type'
 #: hrms/hr/doctype/shift_type/shift_type.json
 msgid "Cyan"
-msgstr ""
+msgstr "Cian"
 
 #. Label of the cycle_name (Data) field in DocType 'Appraisal Cycle'
 #: hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json
@@ -9199,7 +9199,7 @@ msgstr ""
 #. Option for the 'Roster Color' (Select) field in DocType 'Shift Type'
 #: hrms/hr/doctype/shift_type/shift_type.json
 msgid "Orange"
-msgstr ""
+msgstr "Naranja"
 
 #: hrms/hr/page/organizational_chart/organizational_chart.js:4
 msgid "Organizational Chart"
@@ -9733,7 +9733,7 @@ msgstr "Trabajo por obra"
 #. Option for the 'Roster Color' (Select) field in DocType 'Shift Type'
 #: hrms/hr/doctype/shift_type/shift_type.json
 msgid "Pink"
-msgstr ""
+msgstr "Rosa"
 
 #. Label of the planned_vacancies (Int) field in DocType 'Job Opening'
 #: hrms/hr/doctype/job_opening/job_opening.json
@@ -14099,7 +14099,7 @@ msgstr "Anual"
 #. Option for the 'Roster Color' (Select) field in DocType 'Shift Type'
 #: hrms/hr/doctype/shift_type/shift_type.json
 msgid "Yellow"
-msgstr ""
+msgstr "Amarillo"
 
 #. Option for the 'Is Active' (Select) field in DocType 'Salary Structure'
 #. Option for the 'Is Default' (Select) field in DocType 'Salary Structure'

hrms/locale/fa.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2024-11-10 09:33+0000\n"
-"PO-Revision-Date: 2024-11-12 19:06\n"
+"PO-Revision-Date: 2024-11-24 22:07\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -764,7 +764,7 @@ msgstr "تمام دارایی های تخصیص یافته باید قبل از
 
 #: hrms/hr/doctype/employee_onboarding/employee_onboarding.py:48
 msgid "All the mandatory tasks for employee creation are not completed yet."
-msgstr "تمام وظایف اجباری برای ایجاد کارمند هنوز تکمیل نشده است."
+msgstr "تمام تسک‌ها اجباری برای ایجاد کارمند هنوز تکمیل نشده است."
 
 #. Label of the allocate_based_on_leave_policy (Check) field in DocType 'Leave
 #. Control Panel'
@@ -1810,7 +1810,7 @@ msgstr "پایه و متغیر"
 #. Label of the begin_on (Int) field in DocType 'Employee Boarding Activity'
 #: hrms/hr/doctype/employee_boarding_activity/employee_boarding_activity.json
 msgid "Begin On (Days)"
-msgstr "شروع در (روزها)"
+msgstr "شروع در (بر حسب روز)"
 
 #. Label of the begin_check_in_before_shift_start_time (Int) field in DocType
 #. 'Shift Type'
@@ -2215,7 +2215,7 @@ msgstr "مطالبه مزایا برای"
 #. Label of the claim_date (Date) field in DocType 'Employee Benefit Claim'
 #: hrms/payroll/doctype/employee_benefit_claim/employee_benefit_claim.json
 msgid "Claim Date"
-msgstr "تاریخ ادعا"
+msgstr "تاریخ مطالبه"
 
 #: frontend/src/views/Home.vue:47
 #: frontend/src/views/expense_claim/Dashboard.vue:17
@@ -2234,13 +2234,13 @@ msgstr "ادعا کرد"
 #: hrms/hr/report/employee_advance_summary/employee_advance_summary.py:69
 #: hrms/payroll/doctype/employee_benefit_claim/employee_benefit_claim.json
 msgid "Claimed Amount"
-msgstr "مبلغ ادعا شده"
+msgstr "مبلغ مطالبه شده"
 
 #. Label of a Card Break in the Expense Claims Workspace
 #: hrms/hr/workspace/expense_claims/expense_claims.json
 #: hrms/overrides/dashboard_overrides.py:84
 msgid "Claims"
-msgstr "ادعاها"
+msgstr "مطالبه‌ها"
 
 #: frontend/src/components/ListFiltersActionSheet.vue:76
 #: hrms/www/jobs/index.html:20 hrms/www/jobs/index.html:351
@@ -2547,7 +2547,7 @@ msgstr " خواص و مراجع کامپوننت"
 #: hrms/payroll/doctype/salary_detail/salary_detail.json
 #: hrms/payroll/doctype/taxable_salary_slab/taxable_salary_slab.json
 msgid "Condition"
-msgstr "وضعیت"
+msgstr ""
 
 #. Label of the configure_component_tab (Tab Break) field in DocType 'Salary
 #. Component'
@@ -3788,7 +3788,7 @@ msgstr ""
 #. Label of the duration (Int) field in DocType 'Employee Boarding Activity'
 #: hrms/hr/doctype/employee_boarding_activity/employee_boarding_activity.json
 msgid "Duration (Days)"
-msgstr "مدت زمان (روزها)"
+msgstr "مدت زمان (بر حسب روز)"
 
 #: hrms/public/js/utils/index.js:208
 msgid "ERROR({0}): {1}"
@@ -5461,7 +5461,7 @@ msgstr "منقضی تخصیص"
 #. 'Leave Type'
 #: hrms/hr/doctype/leave_type/leave_type.json
 msgid "Expire Carry Forwarded Leaves (Days)"
-msgstr "انقضای مرخصی‌های منتقل شده به دوره بعد (روزها)"
+msgstr "انقضای مرخصی‌های منتقل شده به دوره بعد (بر حسب روز)"
 
 #. Label of the expired (Check) field in DocType 'Leave Allocation'
 #: hrms/hr/doctype/leave_allocation/leave_allocation.json
@@ -8071,7 +8071,7 @@ msgstr "چرخه را پیوند دهید و KRA را به هدف خود تگ ک
 
 #: hrms/controllers/employee_boarding_controller.py:154
 msgid "Linked Project {} and Tasks deleted."
-msgstr "پروژه پیوند شده {} و وظایف حذف شدند."
+msgstr "پروژه پیوند شده {} و تسک‌ها حذف شدند."
 
 #. Label of the loan (Link) field in DocType 'Salary Slip Loan'
 #: hrms/payroll/doctype/salary_slip_loan/salary_slip_loan.json
@@ -8718,7 +8718,7 @@ msgstr "مرخصی های جدید تخصیص داده شد"
 #. Label of the no_of_days (Float) field in DocType 'Leave Control Panel'
 #: hrms/hr/doctype/leave_control_panel/leave_control_panel.json
 msgid "New Leaves Allocated (In Days)"
-msgstr "مرخصی های جدید اختصاص داده شده (در چند روز)"
+msgstr "مرخصی های جدید اختصاص داده شده (بر حسب روز)"
 
 #. Description of the 'Create Shifts After' (Date) field in DocType 'Shift
 #. Assignment Schedule'
@@ -11328,7 +11328,7 @@ msgstr "مبلغ تحریم شده"
 
 #: hrms/hr/doctype/expense_claim/expense_claim.py:360
 msgid "Sanctioned Amount cannot be greater than Claim Amount in Row {0}."
-msgstr "مبلغ تحریم شده نمی تواند بیشتر از مبلغ ادعا در ردیف {0} باشد."
+msgstr "مبلغ تحریم شده نمی تواند بیشتر از مبلغ مطالبه در ردیف {0} باشد."
 
 #: frontend/src/components/AttendanceCalendar.vue:118
 #: hrms/hr/doctype/leave_block_list/leave_block_list.js:62
@@ -12460,13 +12460,13 @@ msgstr "دقیقاً سالهای تکمیل شده را در نظر بگیری
 #: hrms/hr/doctype/employee_separation/employee_separation.js:31
 #: hrms/hr/doctype/expense_claim/expense_claim.json
 msgid "Task"
-msgstr "وظیفه"
+msgstr "تسک"
 
 #. Label of the task_weight (Float) field in DocType 'Employee Boarding
 #. Activity'
 #: hrms/hr/doctype/employee_boarding_activity/employee_boarding_activity.json
 msgid "Task Weight"
-msgstr "وزن وظیفه"
+msgstr "وزن تسک"
 
 #. Name of a Workspace
 #: hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json
@@ -13015,7 +13015,7 @@ msgstr "مجموع ساعات صورتحساب"
 #. Claim'
 #: hrms/hr/doctype/expense_claim/expense_claim.json
 msgid "Total Claimed Amount"
-msgstr "کل مبلغ ادعا شده"
+msgstr "کل مبلغ مطالبه شده"
 
 #. Label of the total_declared_amount (Currency) field in DocType 'Employee Tax
 #. Exemption Declaration'

hrms/locale/main.pot

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Frappe HR VERSION\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2024-11-10 09:33+0000\n"
-"PO-Revision-Date: 2024-11-10 09:33+0000\n"
+"POT-Creation-Date: 2024-11-24 09:35+0000\n"
+"PO-Revision-Date: 2024-11-24 09:35+0000\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
 "MIME-Version: 1.0\n"
@@ -5868,7 +5868,7 @@ msgstr ""
 #. Label of the from_date (Date) field in DocType 'Salary Structure Assignment'
 #. Label of the from_date (Date) field in DocType 'Salary Withholding'
 #. Label of the from_date (Date) field in DocType 'Salary Withholding Cycle'
-#: frontend/src/views/attendance/AttendanceRequestList.vue:24
+#: frontend/src/views/attendance/AttendanceRequestList.vue:27
 #: frontend/src/views/attendance/ShiftRequestList.vue:57
 #: hrms/hr/dashboard_chart_source/hiring_vs_attrition_count/hiring_vs_attrition_count.js:15
 #: hrms/hr/doctype/attendance_request/attendance_request.json
@@ -8140,7 +8140,7 @@ msgid "Log Out"
 msgstr ""
 
 #. Label of the log_type (Select) field in DocType 'Employee Checkin'
-#: frontend/src/views/attendance/EmployeeCheckinList.vue:22
+#: frontend/src/views/attendance/EmployeeCheckinList.vue:25
 #: hrms/hr/doctype/employee_checkin/employee_checkin.json
 msgid "Log Type"
 msgstr ""
@@ -11757,8 +11757,8 @@ msgstr ""
 #. Label of the shift (Link) field in DocType 'Attendance Request'
 #. Label of the shift (Link) field in DocType 'Employee Attendance Tool'
 #. Label of the shift (Link) field in DocType 'Employee Checkin'
-#: frontend/src/views/attendance/AttendanceRequestList.vue:21
-#: frontend/src/views/attendance/EmployeeCheckinList.vue:28
+#: frontend/src/views/attendance/AttendanceRequestList.vue:24
+#: frontend/src/views/attendance/EmployeeCheckinList.vue:31
 #: hrms/hr/doctype/attendance/attendance.json
 #: hrms/hr/doctype/attendance_request/attendance_request.json
 #: hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
@@ -12842,7 +12842,7 @@ msgstr ""
 #. Label of the to_date (Date) field in DocType 'Additional Salary'
 #. Label of the to_date (Date) field in DocType 'Salary Withholding'
 #. Label of the to_date (Date) field in DocType 'Salary Withholding Cycle'
-#: frontend/src/views/attendance/AttendanceRequestList.vue:25
+#: frontend/src/views/attendance/AttendanceRequestList.vue:28
 #: frontend/src/views/attendance/ShiftRequestList.vue:58
 #: hrms/hr/dashboard_chart_source/hiring_vs_attrition_count/hiring_vs_attrition_count.js:22
 #: hrms/hr/doctype/attendance_request/attendance_request.json