From 3df1327b94fba7883cefdf073988a3cbc86d3061 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 29 Oct 2018 15:15:10 +0530 Subject: [PATCH 1/3] fix: Delete button in POS mobile Delete button was covered by page-actions container --- erpnext/public/less/erpnext.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less index 262b0c308c..d4f6c12f77 100644 --- a/erpnext/public/less/erpnext.less +++ b/erpnext/public/less/erpnext.less @@ -412,6 +412,12 @@ body[data-route="pos"] { .collapse-btn { cursor: pointer; } + + @media (max-width: @screen-xs) { + .page-actions { + max-width: 110px; + } + } } .price-info { From 452619c668e39bd5ffcdba5f2dbbbc5d9eaa4bf8 Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Tue, 30 Oct 2018 11:26:01 +0530 Subject: [PATCH 2/3] fix(report): Return if not list (#15849) --- .../student_monthly_attendance_sheet.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py index 0c7baa848f..3f1d5b371b 100644 --- a/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py +++ b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py @@ -73,6 +73,7 @@ def get_attendance_list(from_date, to_date, student_group, students_list): return att_map def get_students_with_leave_application(from_date, to_date, students_list): + if not students_list: return leave_applications = frappe.db.sql(""" select student, from_date, to_date from `tabStudent Leave Application` From 1f7a5dcd0701ce50c7015415497deac9eed59490 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Tue, 30 Oct 2018 12:48:42 +0000 Subject: [PATCH 3/3] bumped to version 10.1.65 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index ecc34a395e..105bff46bf 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '10.1.64' +__version__ = '10.1.65' def get_default_company(user=None): '''Get default company for user'''