Merge branch 'staging' into develop

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'''

erpnext/accounts/page/pos/pos.js

@@ -1573,15 +1573,16 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 				style="margin-right: 5px;">${__('Print')}</a>
 			<a class="btn btn-default new_doc">${__('New')}</a>`);
 
-		$('.print_doc').click(function () {
-			var html = frappe.render(me.print_template_data, me.frm.doc)
-			me.print_document(html)
+		this.msgprint.msg_area.find('.print_doc').on('click', function() {
+			var html = frappe.render(me.print_template_data, me.frm.doc);
+			me.print_document(html);
 		})
 
-		$('.new_doc').click(function () {
-			me.msgprint.hide()
-			me.make_new_cart()
+		this.msgprint.msg_area.find('.new_doc').on('click', function() {
+			me.msgprint.hide();
+			me.make_new_cart();
 		})
+
 	},
 
 	print_document: function (html) {

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` 

erpnext/hooks.py

@@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"
 
 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.15'
+staging_version = '11.0.3-beta.16'
 
 error_report_email = "support@erpnext.com"
 

erpnext/hr/doctype/employee_advance/employee_advance.py

@@ -69,7 +69,7 @@ class EmployeeAdvance(Document):
 			where employee_advance = %s and docstatus=1 and allocated_amount > 0
 		""", self.name)[0][0]
 
-		frappe.db.set_value("Employee Advance", self.name, "claimed_amount", claimed_amount)
+		frappe.db.set_value("Employee Advance", self.name, "claimed_amount", flt(claimed_amount))
 
 @frappe.whitelist()
 def get_due_advance_amount(employee, posting_date):
@@ -109,4 +109,4 @@ def make_bank_entry(dt, dn):
 		"account_type": payment_account.account_type
 	})
 
-	return je.as_dict()
+	return je.as_dict()

erpnext/manufacturing/report/production_analytics/production_analytics.py

@@ -31,7 +31,7 @@ def get_columns(filters):
 		columns.append(
 			{
 			"label": _(label),
-			"field_name":field_name,
+			"fieldname": field_name,
 			"fieldtype": "Float",
 			"width": 120
 		},

erpnext/public/less/erpnext.less

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