nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-19 19:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] additional fixes after deprecating Fiscal Year

Browse Source
This commit is contained in:
Anand Doshi
2016-03-11 14:56:19 +05:30
parent d9cc14ddd5
commit c75c1d7e3e
6 changed files with 175 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
View File

@@ -9,7 +9,7 @@ frappe.query_reports["Monthly Attendance Sheet"] = {
"label": __("Month"),
"fieldtype": "Select",
"options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec",
"default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
"default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
"Dec"][frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth()],
},
{
@@ -40,9 +40,10 @@ frappe.query_reports["Monthly Attendance Sheet"] = {
callback: function(r) {
var year_filter = me.filters_by_name.year;
year_filter.df.options = r.message;
year_filter.set_options(r.message.split("\n")[0]);
year_filter.df.default = r.message.split("\n")[0];
year_filter.refresh();
year_filter.set_input(year_filter.df.default);
}
});
}
}
}

11
erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
View File

@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import cstr, cint
from frappe.utils import cstr, cint, getdate
from frappe import msgprint, _
from calendar import monthrange
@@ -74,7 +74,7 @@ def get_conditions(filters):
filters["month"] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
"Dec"].index(filters.month) + 1
filters["total_days_in_month"] = monthrange(cint(filters.year), filters.month)[1]
conditions = " and month(att_date) = %(month)s and year(att_date) = %(year)s"
@@ -95,5 +95,8 @@ def get_employee_details():
@frappe.whitelist()
def get_attendance_years():
year_list = frappe.db.sql_list("""select distinct YEAR(att_date) from tabAttendance ORDER BY YEAR(att_date)""")
return "\n".join(str(year) for year in year_list)
year_list = frappe.db.sql_list("""select distinct YEAR(att_date) from tabAttendance ORDER BY YEAR(att_date) DESC""")
if not year_list:
year_list = [getdate().year]
return "\n".join(str(year) for year in year_list)