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

Merge branch 'fix_allocated_amt_in_PE' of https://github.com/Anuja-pawar/erpnext into fix_allocated_amt_in_PE

Browse Source
This commit is contained in:
Anuja P 2021-04-26 11:34:33 +05:30
commit 802518b8ac
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -39,6 +39,10 @@ ERPNext is built on the [Frappe Framework](https://github.com/frappe/frappe), a
--- ---
### Containerized Installation
Use docker to deploy ERPNext in production or for development of [Frappe](https://github.com/frappe/frappe) apps. See https://github.com/frappe/frappe_docker for more details.
### Full Install ### Full Install
The Easy Way: our install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/frappe/bench for more details. The Easy Way: our install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/frappe/bench for more details.

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

@ -16,6 +16,7 @@ class HolidayList(Document):
self.validate_days() self.validate_days()
self.total_holidays = len(self.holidays) self.total_holidays = len(self.holidays)
@frappe.whitelist()
def get_weekly_off_dates(self): def get_weekly_off_dates(self):
self.validate_values() self.validate_values()
date_list = self.get_weekly_off_date_list(self.from_date, self.to_date) date_list = self.get_weekly_off_date_list(self.from_date, self.to_date)