From 885ab5dc663e5b04f72cbe1a1d4ce8b46861061f Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Thu, 20 Feb 2020 12:41:42 +0530 Subject: [PATCH] fix: requested changes --- erpnext/hr/doctype/additional_salary/additional_salary.py | 4 ---- erpnext/hr/doctype/salary_slip/salary_slip.py | 1 - 2 files changed, 5 deletions(-) diff --git a/erpnext/hr/doctype/additional_salary/additional_salary.py b/erpnext/hr/doctype/additional_salary/additional_salary.py index a6f34cc759..c37c1b4d2d 100644 --- a/erpnext/hr/doctype/additional_salary/additional_salary.py +++ b/erpnext/hr/doctype/additional_salary/additional_salary.py @@ -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.")) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index a78f55ca32..d03a3dd9a3 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -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)