CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-29 09:01:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(HR): typo in error message in Employee Balance Report (#22306) (#22313)

Browse Source 
* fix: typo in date error message

* fix: error message cleanup in Leave Balance report

(cherry picked from commit af6a0f3a9d)

Co-authored-by: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2020-06-18 15:28:39 +05:30
committed by GitHub
parent 130d254b5a
commit 2417d9492f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ def get_data(filters, leave_types):
conditions = get_conditions(filters)
if filters.to_date <= filters.from_date:
frappe.throw(_("From date can not be greater than than To date"))
frappe.throw(_("'From Date should be less than To Date"))
active_employees = frappe.get_all("Employee",
filters=conditions,
@@ -160,4 +160,4 @@ def get_department_leave_approver_map(department=None):
for k, v in approver_list:
approvers.setdefault(k, []).append(v)
return approvers
return approvers

2
erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py
View File

@@ -10,7 +10,7 @@ from erpnext.hr.report.employee_leave_balance.employee_leave_balance import calc
def execute(filters=None):
if filters.to_date <= filters.from_date:
frappe.throw(_('From date can not be greater than than To date'))
frappe.throw(_('From Date should be less than To Date'))
columns = get_columns()
data = get_data(filters)