Merge pull request #1585 from frappe/version-15-hotfix

chore: release v15
frappe · Mar 27, 2024 · 69df308 · 69df308
2 parents 620a2d7 + affdd4e
commit 69df308
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 8 deletions.
diff --git a/frontend/src/main.css b/frontend/src/main.css
@@ -11,6 +11,11 @@ input:disabled {
 	color: var(--tw-text-color);
 }
 
+/* For Webkit-based browsers */
+body {
+	-webkit-tap-highlight-color: transparent;
+}
+
 /* For Webkit-based browsers (Chrome, Safari and Opera) */
 .hide-scrollbar::-webkit-scrollbar {
 	display: none;

diff --git a/frontend/src/views/employee_advance/Form.vue b/frontend/src/views/employee_advance/Form.vue
@@ -8,6 +8,7 @@
 				:isSubmittable="true"
 				:fields="formFields.data"
 				:id="props.id"
+				:showAttachmentView="true"
 				@validateForm="validateForm"
 			/>
 		</ion-content>

diff --git a/frontend/src/views/leave/Form.vue b/frontend/src/views/leave/Form.vue
@@ -8,6 +8,7 @@
 				:isSubmittable="true"
 				:fields="formFields.data"
 				:id="props.id"
+				:showAttachmentView="true"
 				@validateForm="validateForm"
 			/>
 		</ion-content>

diff --git a/hrms/hr/doctype/vehicle_log/vehicle_log.js b/hrms/hr/doctype/vehicle_log/vehicle_log.js
@@ -2,6 +2,15 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on("Vehicle Log", {
+	setup: function (frm) {
+		frm.set_query("employee", function() {
+			return {
+				filters: {
+					status: "Active",
+				},
+			};
+		});
+	},
 	refresh: function(frm) {
 		if(frm.doc.docstatus == 1) {
 			frm.add_custom_button(__('Expense Claim'), function() {

diff --git a/hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js b/hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
@@ -83,6 +83,10 @@ frappe.query_reports["Monthly Attendance Sheet"] = {
 		const summarized_view = frappe.query_report.get_filter_value('summarized_view');
 		const group_by = frappe.query_report.get_filter_value('group_by');
 
+		if (group_by && column.colIndex === 1) {
+			value = "<strong>" + value + "</strong>";
+		}
+
 		if (!summarized_view) {
 			if ((group_by && column.colIndex > 3) || (!group_by && column.colIndex > 2)) {
 				if (value == 'P' || value == 'WFH')

diff --git a/hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py b/hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
@@ -72,12 +72,19 @@ def get_columns(filters: Filters) -> List[Dict]:
 	columns = []
 
 	if filters.group_by:
+		options_mapping = {
+			"Branch": "Branch",
+			"Grade": "Employee Grade",
+			"Department": "Department",
+			"Designation": "Designation",
+		}
+		options = options_mapping.get(filters.group_by)
 		columns.append(
 			{
 				"label": _(filters.group_by),
 				"fieldname": frappe.scrub(filters.group_by),
 				"fieldtype": "Link",
-				"options": "Branch",
+				"options": options,
 				"width": 120,
 			}
 		)
@@ -191,7 +198,7 @@ def get_data(filters: Filters, attendance_map: Dict) -> List[Dict]:
 			records = get_rows(employee_details[value], filters, holiday_map, attendance_map)
 
 			if records:
-				data.append({group_by_column: frappe.bold(value)})
+				data.append({group_by_column: value})
 				data.extend(records)
 	else:
 		data = get_rows(employee_details, filters, holiday_map, attendance_map)

diff --git a/hrms/payroll/doctype/salary_slip/salary_slip.py b/hrms/payroll/doctype/salary_slip/salary_slip.py
@@ -605,7 +605,7 @@ def calculate_lwp_or_ppl_based_on_leave_application(
 			if not leave:
 				continue
 
-			if not leave.include_holidays and getdate(d) in holidays:
+			if not leave.include_holiday and getdate(d) in holidays:
 				continue
 
 			equivalent_lwp_count = 0

diff --git a/hrms/payroll/report/bank_remittance/bank_remittance.py b/hrms/payroll/report/bank_remittance/bank_remittance.py
@@ -22,7 +22,12 @@ def execute(filters=None):
 			"hidden": 1,
 			"width": 200,
 		},
-		{"label": _("Payment Date"), "fieldtype": "Data", "fieldname": "payment_date", "width": 100},
+		{
+			"label": _("Payment Date"),
+			"fieldtype": "Data",
+			"fieldname": "payment_date",
+			"width": 100,
+		},
 		{
 			"label": _("Employee Name"),
 			"fieldtype": "Link",
@@ -146,12 +151,10 @@ def get_emp_bank_ifsc_code(salary_slips):
 	emp_names = [d.employee for d in salary_slips]
 	ifsc_codes = get_all("Employee", [("name", "IN", emp_names)], ["ifsc_code", "name"])
 
-	ifsc_codes_map = {}
-	for code in ifsc_codes:
-		ifsc_codes_map[code.name] = code
+	ifsc_codes_map = {code.name: code.ifsc_code for code in ifsc_codes}
 
 	for slip in salary_slips:
-		slip["ifsc_code"] = ifsc_codes_map[code.name]["ifsc_code"]
+		slip["ifsc_code"] = ifsc_codes_map[slip.employee]
 
 	return salary_slips