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

Merge pull request #7514 from KanchanChauhan/fix-payroll

Browse Source 
[Minor] Payroll Fix
This commit is contained in:
Nabin Hait 2017-01-17 14:59:59 +05:30 committed by GitHub
commit a987b35b72
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,10 +290,8 @@ class ProcessPayroll(Document):
@frappe.whitelist() @frappe.whitelist()
def get_start_end_dates(payroll_frequency, start_date=None): 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''' '''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] fiscal_year = get_fiscal_year(start_date)[0]
month = "%02d" % getdate(start_date).month month = "%02d" % getdate(start_date).month
m = get_month_details(fiscal_year, month) m = get_month_details(fiscal_year, month)