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

Merge pull request #15301 from saurabh6790/staging

Browse Source 
[fix] setup lang in patch
This commit is contained in:
Saurabh 2018-09-03 16:08:25 +05:30 committed by GitHub
commit 64aed6a16a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches/v11_0/create_department_records_for_each_company.py
View File

@ -3,6 +3,8 @@ from frappe import _
from frappe.utils.nestedset import rebuild_tree from frappe.utils.nestedset import rebuild_tree
def execute(): def execute():
frappe.local.lang = frappe.db.get_default("lang") or 'en'
for doctype in ['department', 'leave_period', 'staffing_plan', 'job_opening', 'payroll_entry']: for doctype in ['department', 'leave_period', 'staffing_plan', 'job_opening', 'payroll_entry']:
frappe.reload_doc("hr", "doctype", doctype) frappe.reload_doc("hr", "doctype", doctype)
@ -37,6 +39,8 @@ def execute():
update_instructors(comp_dict) update_instructors(comp_dict)
frappe.local.lang = 'en'
def update_records(doctype, comp_dict): def update_records(doctype, comp_dict):
when_then = [] when_then = []
for company in comp_dict: for company in comp_dict:

2
erpnext/patches/v11_0/update_department_lft_rgt.py
View File

@ -10,7 +10,7 @@ def execute():
'doctype': 'Department', 'doctype': 'Department',
'department_name': _('All Departments'), 'department_name': _('All Departments'),
'is_group': 1 'is_group': 1
}).insert(ignore_permissions=True) }).insert(ignore_permissions=True, ignore_mandatory=True)
frappe.db.sql("""update `tabDepartment` set parent_department = '{0}' frappe.db.sql("""update `tabDepartment` set parent_department = '{0}'
where is_group = 0""".format(_('All Departments'))) where is_group = 0""".format(_('All Departments')))