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

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait 2016-08-01 17:35:02 +05:30
commit 1ffa76ba5c
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.0.13' __version__ = '7.0.14'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

1
erpnext/patches/v6_20x/remove_customer_supplier_roles.py
View File

@ -3,6 +3,7 @@ import frappe
def execute(): def execute():
frappe.reload_doc("buying", "doctype", "request_for_quotation_supplier") frappe.reload_doc("buying", "doctype", "request_for_quotation_supplier")
frappe.reload_doc("buying", "doctype", "request_for_quotation_item")
frappe.reload_doc("buying", "doctype", "request_for_quotation") frappe.reload_doc("buying", "doctype", "request_for_quotation")
frappe.reload_doc("projects", "doctype", "timesheet") frappe.reload_doc("projects", "doctype", "timesheet")

16
erpnext/patches/v7_0/make_guardian.py
View File

@ -2,12 +2,16 @@ from __future__ import unicode_literals
import frappe import frappe
def execute(): def execute():
students = frappe.get_list("Student", fields=["name", "father_name", "father_email_id", "mother_name", "mother_email_id"]) if frappe.db.exists("DocType", "Student") and "father_name" in frappe.db.get_table_columns("Student"):
for stud in students: frappe.reload_doc("schools", "doctype", "student")
if stud.father_name:
make_guardian(stud.father_name, stud.name, stud.father_email_id) students = frappe.get_list("Student", fields=["name", "father_name", "father_email_id",
if stud.mother_name: "mother_name", "mother_email_id"])
make_guardian(stud.mother_name, stud.name, stud.mother_email_id) for stud in students:
if stud.father_name:
make_guardian(stud.father_name, stud.name, stud.father_email_id)
if stud.mother_name:
make_guardian(stud.mother_name, stud.name, stud.mother_email_id)
def make_guardian(name, student, email=None): def make_guardian(name, student, email=None):
frappe.get_doc({ frappe.get_doc({