Merge pull request #7514 from KanchanChauhan/fix-payroll

[Minor] Payroll Fix
frappe · Jan 17, 2017 · a987b35 · a987b35
2 parents d9e2168 + 6533031
commit a987b35
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py
@@ -290,10 +290,8 @@ def set_start_end_dates(self):
 @frappe.whitelist()
 def get_start_end_dates(payroll_frequency, start_date=None):
 	'''Returns dict of start and end dates for given payroll frequency based on start_date'''
-	if not payroll_frequency:
-		frappe.throw(_("Please set Payroll Frequency first"))
 
-	if payroll_frequency == "Monthly" or payroll_frequency == "Bimonthly":
+	if payroll_frequency == "Monthly" or payroll_frequency == "Bimonthly" or payroll_frequency == "":
 		fiscal_year = get_fiscal_year(start_date)[0]
 		month = "%02d" % getdate(start_date).month
 		m = get_month_details(fiscal_year, month)