nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 20:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(HR): Auto Attendance

Browse Source 
> moved all auto attendance settings from HR Settings to shift
> added shift in attendance and Employee Attendance Log
> reordered and cleaned up fields in HR Settings and Employee DocType
This commit is contained in:
karthikeyan5
2019-06-10 10:24:27 +05:30
parent 66e459b35d
commit e0c5176383
18 changed files with 380 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/projects/doctype/project/project.py
View File

@@ -11,7 +11,7 @@ from frappe.utils import (flt, getdate, get_url, now,
from erpnext.controllers.queries import get_filters_cond
from frappe.desk.reportview import get_match_cond
from erpnext.hr.doctype.daily_work_summary.daily_work_summary import get_users_email
from erpnext.hr.doctype.daily_work_summary_group.daily_work_summary_group import is_holiday_today
from erpnext.hr.doctype.holiday_list.holiday_list import is_holiday
from frappe.model.document import Document
class Project(Document):
@@ -530,7 +530,7 @@ def get_projects_for_collect_progress(frequency, fields):
def send_project_update_email_to_users(project):
doc = frappe.get_doc('Project', project)
if is_holiday_today(doc.holiday_list) or not doc.users: return
if is_holiday(doc.holiday_list) or not doc.users: return
project_update = frappe.get_doc({
"doctype" : "Project Update",

3
erpnext/projects/doctype/timesheet/timesheet.py
View File

@@ -19,9 +19,6 @@ class OverlapError(frappe.ValidationError): pass
class OverWorkLoggedError(frappe.ValidationError): pass
class Timesheet(Document):
def onload(self):
self.get("__onload").maintain_bill_work_hours_same = frappe.db.get_single_value('HR Settings', 'maintain_bill_work_hours_same')
def validate(self):
self.set_employee_name()
self.set_status()