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

Merge pull request #14095 from rohitwaghchaure/leave_application_issue_v11

Browse Source 
[Fix] onload set default employee, leave approver, company
This commit is contained in:
rohitwaghchaure 2018-05-16 19:57:09 +05:30 committed by GitHub
commit 513cd189f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
View File

@ -15,6 +15,10 @@ from erpnext.accounts.report.cash_flow.cash_flow import (get_cash_flow_accounts,
def execute(filters=None): def execute(filters=None):
columns, data, message, chart = [], [], [], [] columns, data, message, chart = [], [], [], []
if not filters.get('company'):
return columns, data, message, chart
fiscal_year = get_fiscal_year_data(filters.get('from_fiscal_year'), filters.get('to_fiscal_year')) fiscal_year = get_fiscal_year_data(filters.get('from_fiscal_year'), filters.get('to_fiscal_year'))
companies_column, companies = get_companies(filters) companies_column, companies = get_companies(filters)
columns = get_columns(companies_column) columns = get_columns(companies_column)

14
erpnext/hr/doctype/leave_application/leave_application.js
View File

@ -50,8 +50,11 @@ frappe.ui.form.on("Leave Application", {
date: frm.doc.posting_date date: frm.doc.posting_date
}, },
callback: function(r) { callback: function(r) {
if (!r.exc && r.message) { if (!r.exc && r.message['leave_allocation']) {
leave_details = r.message; leave_details = r.message['leave_allocation'];
}
if (!r.exc && r.message['leave_approver']) {
frm.set_value('leave_approver', r.message['leave_approver']);
} }
} }
}); });
@ -74,6 +77,13 @@ frappe.ui.form.on("Leave Application", {
if(frm.doc.__islocal && !in_list(frappe.user_roles, "Employee")) { if(frm.doc.__islocal && !in_list(frappe.user_roles, "Employee")) {
frm.set_intro(__("Fill the form and save it")); frm.set_intro(__("Fill the form and save it"));
} }
if (!frm.doc.employee && frappe.defaults.get_user_permissions()) {
const perm = frappe.defaults.get_user_permissions();
if (perm && perm['Employee']) {
frm.set_value('employee', perm['Employee']["docs"][0])
}
}
}, },
employee: function(frm) { employee: function(frm) {

14
erpnext/hr/doctype/leave_application/leave_application.py
View File

@ -374,7 +374,12 @@ def get_leave_details(employee, date):
"pending_leaves": leaves_pending, "pending_leaves": leaves_pending,
"remaining_leaves": remaining_leaves} "remaining_leaves": remaining_leaves}
return leave_allocation ret = {
'leave_allocation': leave_allocation,
'leave_approver': get_leave_approver(employee)
}
return ret
@frappe.whitelist() @frappe.whitelist()
def get_leave_balance_on(employee, leave_type, date, allocation_records=None, def get_leave_balance_on(employee, leave_type, date, allocation_records=None,
@ -603,3 +608,10 @@ def get_approved_leaves_for_period(employee, leave_type, from_date, to_date):
return leave_days return leave_days
def get_leave_approver(employee, department=None):
if not department:
department = frappe.db.get_value('Employee', employee, 'department')
if department:
return frappe.db.get_value('Department Approver', {'parent': department,
'parentfield': 'leave_approver', 'idx': 1}, 'approver')