From ee874a2a3667b239e44d12c37e02ac92a1823a67 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 22 Nov 2016 12:42:24 +0530 Subject: [PATCH 1/4] Update student_admission.py --- erpnext/schools/doctype/student_admission/student_admission.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/schools/doctype/student_admission/student_admission.py b/erpnext/schools/doctype/student_admission/student_admission.py index b0c7b553c24..a849d65d7b6 100644 --- a/erpnext/schools/doctype/student_admission/student_admission.py +++ b/erpnext/schools/doctype/student_admission/student_admission.py @@ -23,7 +23,7 @@ class StudentAdmission(WebsiteGenerator): context.parents = [{'name': 'admissions', 'title': _('All Student Admissions') }] def get_title(self): - return _("Admissions for {0}").format(self.academic_term) + return _("Admissions for {0}").format(self.academic_year) def get_list_context(context): context.title = _("Student Admissions") From 334f0327803f650b0aef583f090a7c7ff9ffed60 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 22 Nov 2016 13:30:13 +0530 Subject: [PATCH 2/4] fix patch --- erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py b/erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py index 2883a8adc3d..9f159be2da5 100644 --- a/erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py +++ b/erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py @@ -9,6 +9,8 @@ def execute(): if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")): return + frappe.reload_doctype("Purchase Invoice") + for pi in frappe.db.sql("""select name from `tabPurchase Invoice` where update_stock=1 and docstatus=1 order by posting_date asc""", as_dict=1): From 698c040d215d8b100b441e5baab550c7f6a6b2e6 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Nov 2016 23:16:40 +0530 Subject: [PATCH 3/4] [hot] fix quotation (#7039) --- erpnext/selling/sales_common.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js index 59fdf703a36..97eca54fe10 100644 --- a/erpnext/selling/sales_common.js +++ b/erpnext/selling/sales_common.js @@ -66,7 +66,8 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ }); } - if(this.frm.fields_dict["packed_items"].grid.get_field('batch_no')) { + if(this.frm.fields_dict["packed_items"] && + this.frm.fields_dict["packed_items"].grid.get_field('batch_no')) { this.frm.set_query("batch_no", "packed_items", function(doc, cdt, cdn) { return me.set_query_for_batch(doc, cdt, cdn) }); From 6557e37d5c26fd81acb99c3d628c36f2d4d7ce17 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Nov 2016 23:48:28 +0600 Subject: [PATCH 4/4] bumped to version 7.1.17 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 9660cb96889..48b942e5342 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.1.16' +__version__ = '7.1.17' def get_default_company(user=None): '''Get default company for user'''