| commit | f9148f3a6f833c8c9ba29eb2c6bc6400c195d30d | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@erpnext.com> | Tue Mar 08 17:40:10 2016 +0530 |
| committer | Anand Doshi <anand@erpnext.com> | Tue Mar 08 17:40:10 2016 +0530 |
| tree | 444361a2c54a2610e88deb1a625b88dd269c0406 | |
| parent | ba7b05ad271363e4119099c6daab925178b9903a [diff] | |
| parent | 102f9062e88a687258e63bee1bc9d92de3a1b016 [diff] |
Merge branch 'bohlian-develop' into develop
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py index 13516b6..a71200c 100644 --- a/erpnext/hr/doctype/process_payroll/process_payroll.py +++ b/erpnext/hr/doctype/process_payroll/process_payroll.py
@@ -188,7 +188,7 @@ return journal_entry.as_dict() - +@frappe.whitelist() def get_month_details(year, month): ysd = frappe.db.get_value("Fiscal Year", year, "year_start_date") if ysd: