Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Rushabh Mehta 2012-12-27 18:57:41 +05:30
commit caacdfbefc

View File

@ -26,7 +26,8 @@ report.customize_filters = function() {
ignore : 1, ignore : 1,
options: 'Fiscal Year', options: 'Fiscal Year',
parent:'Leave Allocation', parent:'Leave Allocation',
in_first_page:1 in_first_page:1,
report_default: sys_defaults.fiscal_year
}); });
this.add_filter({ this.add_filter({
fieldname:'employee_name', fieldname:'employee_name',