Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7640 from KanchanChauhan/remove-date-validation-salary-structure

Browse Source 
[Minor] From Date validation removed from Salary Structure
This commit is contained in:
KanchanChauhan 2017-02-01 17:42:18 +05:30 committed by GitHub
commit 3dc96cf71e
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/hr/doctype/salary_structure/salary_structure.py
View File

@ -4,8 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe.utils import cstr, flt, getdate, cint from frappe.utils import flt, cint
from frappe.model.naming import make_autoname
from frappe import _ from frappe import _
from frappe.model.mapper import get_mapped_doc from frappe.model.mapper import get_mapped_doc
from frappe.model.document import Document from frappe.model.document import Document
@ -15,7 +14,6 @@ class SalaryStructure(Document):
def validate(self): def validate(self):
self.validate_amount() self.validate_amount()
self.validate_joining_date()
for e in self.get('employees'): for e in self.get('employees'):
set_employee_name(e) set_employee_name(e)
@ -29,12 +27,6 @@ class SalaryStructure(Document):
def validate_amount(self): def validate_amount(self):
if flt(self.net_pay) < 0 and self.salary_slip_based_on_timesheet: if flt(self.net_pay) < 0 and self.salary_slip_based_on_timesheet:
frappe.throw(_("Net pay cannot be negative")) frappe.throw(_("Net pay cannot be negative"))
def validate_joining_date(self):
for e in self.get('employees'):
joining_date = getdate(frappe.db.get_value("Employee", e.employee, "date_of_joining"))
if getdate(self.from_date) < joining_date:
frappe.throw(_("From Date in Salary Structure cannot be lesser than Employee Joining Date."))
@frappe.whitelist() @frappe.whitelist()