nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-30 23:18:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into payment-terms

Browse Source
This commit is contained in:
tunde
2017-09-12 11:54:52 +01:00
parent ecb118fb3b f8f29677fd
commit 1255aa0f11
102 changed files with 25509 additions and 10563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/patches/v8_0/merge_student_batch_and_student_group.py
View File

@@ -9,7 +9,8 @@ from frappe.model.mapper import get_mapped_doc
def execute():
# for converting student batch into student group
for doctype in ["Student Group", "Student Group Student", "Student Group Instructor", "Student Attendance", "Student"]:
for doctype in ["Student Group", "Student Group Student",
"Student Group Instructor", "Student Attendance", "Student", "Student Batch Name"]:
frappe.reload_doc("schools", "doctype", frappe.scrub(doctype))
if frappe.db.table_exists("Student Batch"):
@@ -39,8 +40,10 @@ def execute():
student.update({"group_roll_number": i+1})
doc.extend("students", student_list)
instructor_list = frappe.db.sql('''select instructor, instructor_name from `tabStudent Batch Instructor`
where parent=%s''', (doc.student_group_name), as_dict=1)
instructor_list = None
if frappe.db.table_exists("Student Batch Instructor"):
instructor_list = frappe.db.sql('''select instructor, instructor_name from `tabStudent Batch Instructor`
where parent=%s''', (doc.student_group_name), as_dict=1)
if instructor_list:
doc.extend("instructors", instructor_list)
doc.save()

2
erpnext/patches/v8_7/set_offline_in_pos_settings.py
View File

@@ -8,5 +8,5 @@ def execute():
frappe.reload_doc('accounts', 'doctype', 'pos_settings')
doc = frappe.get_doc('POS Settings')
doc.is_online = 0
doc.use_pos_in_offline_mode = 1
doc.save()