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

fix: requested changes

Browse Source
This commit is contained in:
Anurag Mishra 2020-02-20 12:41:42 +05:30
parent 2d7fcab2c9
commit 885ab5dc66
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/additional_salary/additional_salary.py
View File

@ -24,10 +24,6 @@ class AdditionalSalary(Document):
date_of_joining, relieving_date = frappe.db.get_value("Employee", self.employee,
["date_of_joining", "relieving_date"])
if not self.is_recurring and not self.payroll_date:
frappe.msgprint(_("Please enter Payroll Date."), indicator='blue', raise_exception=1)
if self.is_recurring and not self.from_date and not self.to_date:
frappe.msgprint(_("Please enter From Date and To Date."), indicator='blue', raise_exception=1)
if getdate(self.from_date) > getdate(self.to_date):
frappe.throw(_("From Date can not be greater than To Date."))

1
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@ -410,7 +410,6 @@ class SalarySlip(TransactionBase):
if additional_components:
for additional_component in additional_components:
amount = additional_component.amount
print("-------------[>>>]", amount)
overwrite = additional_component.overwrite
self.update_component_row(frappe._dict(additional_component.struct_row), amount,
component_type, overwrite=overwrite)