From f2d9039906efa3764fb0adb0b012fae6514d983a Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 11:15:53 +0530 Subject: [PATCH 1/3] fix(Leave Type): translatability of tour step (backport #1371) (#1372) * fix(Leave Type): translatability of tour step * fix(Leave Applications): make role and settings translatable * chore: fix tour messages --------- Co-authored-by: Rucha Mahabal (cherry picked from commit febb7d9ae1662b4b1087ba3873be4ca775cc1c5a) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> --- hrms/hr/doctype/leave_application/leave_application.py | 6 +++--- hrms/hr/doctype/leave_type/leave_type.js | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hrms/hr/doctype/leave_application/leave_application.py b/hrms/hr/doctype/leave_application/leave_application.py index e8d8ed22e7..ab617785d1 100755 --- a/hrms/hr/doctype/leave_application/leave_application.py +++ b/hrms/hr/doctype/leave_application/leave_application.py @@ -147,15 +147,15 @@ def validate_dates(self): if not allowed_role: frappe.throw( _("Backdated Leave Application is restricted. Please set the {} in {}").format( - frappe.bold("Role Allowed to Create Backdated Leave Application"), - get_link_to_form("HR Settings", "HR Settings"), + frappe.bold(_("Role Allowed to Create Backdated Leave Application")), + get_link_to_form("HR Settings", "HR Settings", _("HR Settings")), ) ) if allowed_role and allowed_role not in user_roles: frappe.throw( _("Only users with the {0} role can create backdated leave applications").format( - allowed_role + _(allowed_role) ) ) diff --git a/hrms/hr/doctype/leave_type/leave_type.js b/hrms/hr/doctype/leave_type/leave_type.js index b930dedaca..6fc531cae3 100644 --- a/hrms/hr/doctype/leave_type/leave_type.js +++ b/hrms/hr/doctype/leave_type/leave_type.js @@ -23,7 +23,12 @@ frappe.tour["Leave Type"] = [ { fieldname: "is_compensatory", title: "Is Compensatory Leave", - description: __("Leaves you can avail against a holiday you worked on. You can claim Compensatory Off Leave using Compensatory Leave request. Click") + " here " + __('to know more') + description: __( + "Leaves you can avail against a holiday you worked on. You can claim Compensatory Off Leave using Compensatory Leave Request. Click {0} to know more", + [ + `${__("here")}` + ] + ) }, { fieldname: "allow_encashment", From db530c1dad00772b4263b142a3d2b7b862a85c41 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 11:28:31 +0530 Subject: [PATCH 2/3] fix: employee advance option added to payment entry (backport #1380) (#1385) * fix: employee advance option added to payment entry * fix: Removed duplicate filter for expense claim. --------- Co-authored-by: nesscale-com <83069615+nesscale-com@users.noreply.github.com> (cherry picked from commit b51df740f2d2605335f8c23fdb501346dbaf232f) Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com> --- hrms/public/js/erpnext/payment_entry.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hrms/public/js/erpnext/payment_entry.js b/hrms/public/js/erpnext/payment_entry.js index d671fac911..ab80e3cd9a 100644 --- a/hrms/public/js/erpnext/payment_entry.js +++ b/hrms/public/js/erpnext/payment_entry.js @@ -11,7 +11,7 @@ frappe.ui.form.on("Payment Entry", { } else if (frm.doc.party_type == "Supplier") { doctypes = ["Purchase Order", "Purchase Invoice", "Journal Entry"]; } else if (frm.doc.party_type == "Employee") { - doctypes = ["Expense Claim", "Journal Entry"]; + doctypes = ["Expense Claim", "Employee Advance", "Journal Entry"]; } else { doctypes = ["Journal Entry"]; } @@ -32,10 +32,13 @@ frappe.ui.form.on("Payment Entry", { } if (child.reference_doctype == "Expense Claim") { - filters["docstatus"] = 1; filters["is_paid"] = 0; } + if (child.reference_doctype == "Employee Advance") { + filters["status"] = "Unpaid"; + } + return { filters: filters }; From 26b94042b3d33012526fef59742f4bd2f36611d4 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 11:56:54 +0530 Subject: [PATCH 3/3] fix: "is_query_report" check for Vehicle Expenses Report (backport #1383) (#1387) * fix: "is_query_report" check for Vehicle Expenses Report * fix: timestamp updated (cherry picked from commit 68021748cbeba3f5714195fad5324202737952cd) Co-authored-by: Jeevan syriac <95610320+Jeevansyriac@users.noreply.github.com> --- hrms/hr/workspace/expense_claims/expense_claims.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hrms/hr/workspace/expense_claims/expense_claims.json b/hrms/hr/workspace/expense_claims/expense_claims.json index bec2280eb2..f3f24df5eb 100644 --- a/hrms/hr/workspace/expense_claims/expense_claims.json +++ b/hrms/hr/workspace/expense_claims/expense_claims.json @@ -247,7 +247,7 @@ }, { "hidden": 0, - "is_query_report": 0, + "is_query_report": 1, "label": "Vehicle Expenses", "link_count": 0, "link_to": "Vehicle Expenses", @@ -256,7 +256,7 @@ "type": "Link" } ], - "modified": "2023-08-02 10:19:14.376183", + "modified": "2024-02-05 09:10:45.636550", "modified_by": "Administrator", "module": "HR", "name": "Expense Claims",