Merge branch 'staging-fixes' into staging

bumped to version 11.0.3-beta.16
Merge branch 'master' into staging-fixes
2018-10-30 12:53:35 +00:00 · 2018-10-30 12:53:35 +00:00 · 2018-10-30 12:48:45 +00:00 · 2018-10-30 12:48:42 +00:00 · 2018-10-30 12:48:42 +00:00 · 2018-10-30 11:26:01 +05:30
8 changed files with 20 additions and 12 deletions
--- 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.63'
+__version__ = '10.1.65'

 def get_default_company(user=None):
 	'''Get default company for user'''
--- a/erpnext/accounts/page/pos/pos.js
+++ b/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) {
--- a/erpnext/config/docs.py
+++ b/erpnext/config/docs.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals

-source_link = "https://github.com/frappe/erpnext"
+source_link = "https://github.com/erpnext/foundation"
--- 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` 
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"

 develop_version = '11.x.x-develop'
-staging_version = '11.0.3-beta.14'
+staging_version = '11.0.3-beta.16'

 error_report_email = "support@erpnext.com"

--- a/erpnext/hr/doctype/employee_advance/employee_advance.py
+++ b/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()
--- a/erpnext/manufacturing/report/production_analytics/production_analytics.py
+++ b/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
 		},
--- a/erpnext/public/less/erpnext.less
+++ b/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 {
Author	SHA1	Message	Date
Ameya Shenoy	71ede099ea	Merge branch 'staging-fixes' into staging	2018-10-30 12:53:35 +00:00
Ameya Shenoy	d45fef5423	bumped to version 11.0.3-beta.16	2018-10-30 12:53:35 +00:00
Ameya Shenoy	6178b79555	Merge branch 'master' into staging-fixes	2018-10-30 12:48:45 +00:00
Ameya Shenoy	d9a82738d0	Merge branch 'hotfix'	2018-10-30 12:48:42 +00:00
Ameya Shenoy	1f7a5dcd07	bumped to version 10.1.65	2018-10-30 12:48:42 +00:00
Shreya Shah	452619c668	fix(report): Return if not list (#15849 )	2018-10-30 11:26:01 +05:30
rohitwaghchaure	dca4b294bd	Merge pull request #15853 from rohitwaghchaure/delete_button_not_working_for_print_in_mobile [Fix] Delete button not working in POS for mobile	2018-10-29 16:52:34 +05:30
Rohit Waghchaure	152a0c86b0	[Fix] Delete button not working in POS for Ipad	2018-10-29 16:50:18 +05:30
Shreya Shah	85a9b52dfa	Merge pull request #15789 from deepeshgarg007/production-analytics [Bug-fix]Production analytics	2018-10-29 15:49:19 +05:30
Shreya Shah	69bbe1995c	Update production_analytics.py	2018-10-29 15:38:21 +05:30
rohitwaghchaure	9d0dba5569	Merge pull request #15851 from frappe/pos-delete-fix fix: Delete button in POS mobile	2018-10-29 15:19:11 +05:30
deepeshgarg007	7b91f9fa0c	Bug Fixes	2018-10-29 15:16:25 +05:30
Faris Ansari	3df1327b94	fix: Delete button in POS mobile Delete button was covered by page-actions container	2018-10-29 15:15:10 +05:30
Shreya Shah	81cdd967d7	Merge pull request #15794 from ashish-greycube/patch-1 Update employee_advance.py	2018-10-29 14:38:21 +05:30
ashish-greycube	4d47c63db1	Update employee_advance.py https://github.com/frappe/erpnext/issues/13694 Cancel of already paid "Expense Claim" gives error IntegrityError: (1048, u"Column 'claimed_amount' cannot be null") Sol: claimed_amount should be flt	2018-10-24 16:35:31 +05:30
Ameya Shenoy	9750d5c184	Merge branch 'staging-fixes' into staging	2018-10-23 12:56:51 +00:00
Ameya Shenoy	6adcfa6032	bumped to version 11.0.3-beta.15	2018-10-23 12:56:51 +00:00
Ameya Shenoy	3643e7b1b4	Merge branch 'master' into staging-fixes	2018-10-23 12:52:48 +00:00
Ameya Shenoy	38eaaade89	Merge branch 'hotfix'	2018-10-23 12:52:46 +00:00
Ameya Shenoy	2a98e59bd4	bumped to version 10.1.64	2018-10-23 12:52:46 +00:00
Ameya Shenoy	03348364e9	Merge pull request #15739 from kennethsequeira/hotfix Fix for "Improve this page" incorrect link generated in v10 sites	2018-10-23 18:05:25 +05:30
Kenneth Sequeira	991c121b57	added source link for ERPNext docs	2018-10-19 14:31:21 +05:30
Kenneth Sequeira	23ec18e3e4	added docs_app variable to point docs to foundation app	2018-10-19 03:28:12 +05:30