Merge branch 'master' into staging-fixes
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index ff96e92..45a1b1f 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
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'''
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 0c7baa8..3f1d5b3 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 @@
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`
diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less
index e962e91..b746cc1 100644
--- a/erpnext/public/less/erpnext.less
+++ b/erpnext/public/less/erpnext.less
@@ -426,6 +426,12 @@
.collapse-btn {
cursor: pointer;
}
+
+ @media (max-width: @screen-xs) {
+ .page-actions {
+ max-width: 110px;
+ }
+ }
}
.price-info {