| commit | 250ebe5888bdaf78cd33013512bf24e0a38848b8 | [log] [tgz] |
|---|---|---|
| author | Himanshu Warekar <himanshuwarekar@yahoo.com> | Tue Mar 05 17:45:14 2019 +0530 |
| committer | Himanshu Warekar <himanshuwarekar@yahoo.com> | Tue Mar 05 17:45:14 2019 +0530 |
| tree | 9ca48260268ad876f4e85f05d5c094fc338ead76 | |
| parent | 219b9f4150641f2119ea9ab89851dacf1a933098 [diff] | |
| parent | e2e4028b39725c1f0d3e383a7453824c7e7441f7 [diff] |
Merge branch 'develop' of https://github.com/frappe/erpnext into additional_salary_develop
diff --git a/erpnext/hr/doctype/additional_salary/additional_salary.py b/erpnext/hr/doctype/additional_salary/additional_salary.py index 6f87954..e25e69e 100644 --- a/erpnext/hr/doctype/additional_salary/additional_salary.py +++ b/erpnext/hr/doctype/additional_salary/additional_salary.py
@@ -11,8 +11,8 @@ class AdditionalSalary(Document): def validate(self): self.validate_dates() - if self.amount <= 0: - frappe.throw(_("Amount should be greater than zero.")) + if self.amount < 0: + frappe.throw(_("Amount should not be less than zero.")) def validate_dates(self): date_of_joining, relieving_date = frappe.db.get_value("Employee", self.employee,