From 7b29dc72080861c9c62bf6ac11b13c3e279c33bc Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Fri, 30 Dec 2016 12:19:09 +0530 Subject: [PATCH] [Fix] Monthly Salary Register Fix --- .../monthly_salary_register.js | 21 +++++++++---------- .../monthly_salary_register.py | 19 +++++++---------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js index 6d9111f7ee..a879b39a6c 100644 --- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js +++ b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js @@ -4,19 +4,18 @@ frappe.query_reports["Monthly Salary Register"] = { "filters": [ { - "fieldname":"month", - "label": __("Month"), - "fieldtype": "Select", - "options": "\nJan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec", - "default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", - "Dec"][frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth()], + "fieldname":"from_date", + "label": __("From"), + "fieldtype": "Date", + "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1), + "reqd": 1 }, { - "fieldname":"fiscal_year", - "label": __("Fiscal Year"), - "fieldtype": "Link", - "options": "Fiscal Year", - "default": sys_defaults.fiscal_year, + "fieldname":"to_date", + "label": __("To"), + "fieldtype": "Date", + "default": frappe.datetime.get_today(), + "reqd": 1 }, { "fieldname":"employee", diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py index 1e9d03ee04..e8d0a0bf2f 100644 --- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +++ b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py @@ -18,7 +18,7 @@ def execute(filters=None): data = [] for ss in salary_slips: row = [ss.name, ss.employee, ss.employee_name, ss.branch, ss.department, ss.designation, - ss.company, ss.month, ss.leave_withut_pay, ss.payment_days] + ss.company, ss.start_date, ss.end_date, ss.leave_withut_pay, ss.payment_days] for e in earning_types: row.append(ss_earning_map.get(ss.name, {}).get(e)) @@ -38,7 +38,7 @@ def get_columns(salary_slips): columns = [ _("Salary Slip ID") + ":Link/Salary Slip:150",_("Employee") + ":Link/Employee:120", _("Employee Name") + "::140", _("Branch") + ":Link/Branch:120", _("Department") + ":Link/Department:120", _("Designation") + ":Link/Designation:120", - _("Company") + ":Link/Company:120", _("Month") + "::80", _("Leave Without Pay") + ":Float:130", + _("Company") + ":Link/Company:120", _("Start Date") + "::80", _("End Date") + "::80", _("Leave Without Pay") + ":Float:130", _("Payment Days") + ":Float:120" ] @@ -60,23 +60,18 @@ def get_columns(salary_slips): def get_salary_slips(filters): conditions, filters = get_conditions(filters) salary_slips = frappe.db.sql("""select * from `tabSalary Slip` where docstatus = 1 %s - order by employee, month""" % conditions, filters, as_dict=1) + order by employee""" % conditions, filters, as_dict=1) if not salary_slips: - frappe.throw(_("No salary slip found for month {0} and year {1}").format( - filters.get("month"), filters.get("fiscal_year"))) + frappe.throw(_("No salary slip found between {0} and {1}").format( + filters.get("from_date"), filters.get("to_date"))) return salary_slips def get_conditions(filters): conditions = "" - if filters.get("month"): - month = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", - "Dec"].index(filters["month"]) + 1 - filters["month"] = month - conditions += " and month = %(month)s" - - if filters.get("fiscal_year"): conditions += " and fiscal_year = %(fiscal_year)s" + if filters.get("from_date"): conditions += " and start_date >= %(from_date)s" + if filters.get("to_date"): conditions += " and end_date <= %(to_date)s" if filters.get("company"): conditions += " and company = %(company)s" if filters.get("employee"): conditions += " and employee = %(employee)s"