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

Merge pull request #6322 from RobertSchouten/patch-23

Browse Source 
leave balance now fy not calendar
This commit is contained in:
Nabin Hait 2016-09-12 18:53:16 +05:30 committed by GitHub
commit fcbb7692fa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/report/employee_leave_balance/employee_leave_balance.js
View File

@ -8,14 +8,14 @@ frappe.query_reports["Employee Leave Balance"] = {
"label": __("From Date"), "label": __("From Date"),
"fieldtype": "Date", "fieldtype": "Date",
"reqd": 1, "reqd": 1,
"default": frappe.datetime.year_start() "default": frappe.defaults.get_default("year_start_date")
}, },
{ {
"fieldname":"to_date", "fieldname":"to_date",
"label": __("To Date"), "label": __("To Date"),
"fieldtype": "Date", "fieldtype": "Date",
"reqd": 1, "reqd": 1,
"default": frappe.datetime.year_end() "default": frappe.defaults.get_default("year_end_date")
}, },
{ {
"fieldname":"company", "fieldname":"company",