Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Ameya Shenoy 2018-10-30 12:48:42 +00:00
commit d9a82738d0
No known key found for this signature in database
GPG Key ID: AC016A555657D0A3
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.64' __version__ = '10.1.65'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

1
erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
View File

@ -73,6 +73,7 @@ def get_attendance_list(from_date, to_date, student_group, students_list):
return att_map return att_map
def get_students_with_leave_application(from_date, to_date, students_list): def get_students_with_leave_application(from_date, to_date, students_list):
if not students_list: return
leave_applications = frappe.db.sql(""" leave_applications = frappe.db.sql("""
select student, from_date, to_date select student, from_date, to_date
from `tabStudent Leave Application` from `tabStudent Leave Application`

6
erpnext/public/less/erpnext.less
View File

@ -412,6 +412,12 @@ body[data-route="pos"] {
.collapse-btn { .collapse-btn {
cursor: pointer; cursor: pointer;
} }
@media (max-width: @screen-xs) {
.page-actions {
max-width: 110px;
}
}
} }
.price-info { .price-info {