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

Merge pull request #5629 from saurabh6790/erp_v7_fix

Browse Source 
[Minor][fix] Holiday list message fix and company attr fix
This commit is contained in:
Rushabh Mehta 2016-07-04 14:07:16 +05:30 committed by GitHub
commit 6fa4ec15aa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/employee/employee.py
View File

@ -238,7 +238,7 @@ def get_holiday_list_for_employee(employee, raise_exception=True):
holiday_list = frappe.db.get_value("Company", company, "default_holiday_list") holiday_list = frappe.db.get_value("Company", company, "default_holiday_list")
if not holiday_list and raise_exception: if not holiday_list and raise_exception:
frappe.throw(_('Please set a default Holiday List for Employee {0} or Company {0}').format(employee, company)) frappe.throw(_('Please set a default Holiday List for Employee {0} or Company {1}').format(employee, company))
return holiday_list return holiday_list

2
erpnext/setup/doctype/company/company.py
View File

@ -13,7 +13,7 @@ from frappe.model.document import Document
class Company(Document): class Company(Document):
def onload(self): def onload(self):
self.get("__onload").transactions_exist = self.check_if_transactions_exist() self.get("__onload")["transactions_exist"] = self.check_if_transactions_exist()
def check_if_transactions_exist(self): def check_if_transactions_exist(self):
exists = False exists = False