nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 12:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Monthly Salary Register: Month is now optional

Browse Source
This commit is contained in:
Nabin Hait
2014-01-09 17:38:50 +05:30
parent 68b0d54b4b
commit f3ded044e0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hr/report/monthly_salary_register/monthly_salary_register.js
View File

@@ -7,7 +7,7 @@ wn.query_reports["Monthly Salary Register"] = {
"fieldname":"month", "fieldname":"month",
"label": wn._("Month"), "label": wn._("Month"),
"fieldtype": "Select", "fieldtype": "Select",
"options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec", "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", "default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
"Dec"][wn.datetime.str_to_obj(wn.datetime.get_today()).getMonth()], "Dec"][wn.datetime.str_to_obj(wn.datetime.get_today()).getMonth()],
}, },

4
hr/report/monthly_salary_register/monthly_salary_register.py
View File

@@ -59,8 +59,8 @@ def get_columns(salary_slips):
def get_salary_slips(filters): def get_salary_slips(filters):
conditions, filters = get_conditions(filters) conditions, filters = get_conditions(filters)
salary_slips = webnotes.conn.sql("""select * from `tabSalary Slip` where docstatus = 1 %s""" % salary_slips = webnotes.conn.sql("""select * from `tabSalary Slip` where docstatus = 1 %s
conditions, filters, as_dict=1) order by employee, month""" % conditions, filters, as_dict=1)
if not salary_slips: if not salary_slips:
msgprint(_("No salary slip found for month: ") + cstr(filters.get("month")) + msgprint(_("No salary slip found for month: ") + cstr(filters.get("month")) +