Merge pull request #1402 from frappe/version-14-hotfix

chore: release v14
frappe · Feb 6, 2024 · 78c69b8 · 78c69b8
2 parents 19dd44f + 26b9404
commit 78c69b8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git 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
@@ -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") + " <a href='https://docs.erpnext.com/docs/v13/user/manual/en/human-resources/compensatory-leave-request' target='_blank'>here</a> " + __('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",
+			[
+				`<a href='https://frappehr.com/docs/v14/en/compensatory-leave-request' target='_blank'>${__("here")}</a>`
+			]
+		)
 	},
 	{
 		fieldname: "allow_encashment",

diff --git 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",

diff --git 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
 			};