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

merge

Browse Source
This commit is contained in:
Rushabh Mehta
2013-02-19 15:36:38 +05:30
parent 5117d9c266 789af74891
commit 5c6216f0bd
6 changed files with 114 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
hr/doctype/leave_application/leave_application.py
View File

@@ -18,9 +18,8 @@ from __future__ import unicode_literals
import webnotes
from webnotes import _
from webnotes.utils import cint, cstr, date_diff, flt, formatdate, getdate, get_url_to_form, get_fullname
from webnotes.utils import cint, cstr, date_diff, flt, formatdate, getdate, get_url_to_form
from webnotes import msgprint
from webnotes.utils.email_lib import sendmail
class LeaveDayBlockedError(Exception): pass
@@ -33,7 +32,6 @@ class DocType(DocListController):
self.previous_doc = None
def validate(self):
# if self.doc.leave_approver == self.doc.owner:
self.validate_to_date()
self.validate_balance_leaves()
self.validate_leave_overlap()
@@ -41,8 +39,8 @@ class DocType(DocListController):
self.validate_block_days()
def on_update(self):
if (not self.previous_doc and self.doc.leave_approver) or (self.doc.status == "Open" \
and self.previous_doc.leave_approver != self.doc.leave_approver):
if (not self.previous_doc and self.doc.leave_approver) or (self.previous_doc and \
self.doc.status == "Open" and self.previous_doc.leave_approver != self.doc.leave_approver):
# notify leave approver about creation
self.notify_leave_approver()
elif self.previous_doc and \
@@ -105,9 +103,7 @@ class DocType(DocListController):
raise Exception
def validate_balance_leaves(self):
if self.doc.from_date and self.doc.to_date and not is_lwp(self.doc.leave_type):
self.doc.leave_balance = get_leave_balance(self.doc.employee,
self.doc.leave_type, self.doc.fiscal_year)["leave_balance"]
if self.doc.from_date and self.doc.to_date:
self.doc.total_leave_days = self.get_total_leave_days()["total_leave_days"]
if self.doc.total_leave_days == 0:
@@ -115,9 +111,13 @@ class DocType(DocListController):
coincide with holiday(s). You need not apply for leave."),
raise_exception=1)
if self.doc.leave_balance - self.doc.total_leave_days < 0:
msgprint("There is not enough leave balance for Leave Type: %s" % \
(self.doc.leave_type,), raise_exception=1)
if not is_lwp(self.doc.leave_type):
self.doc.leave_balance = get_leave_balance(self.doc.employee,
self.doc.leave_type, self.doc.fiscal_year)["leave_balance"]
if self.doc.leave_balance - self.doc.total_leave_days < 0:
msgprint("There is not enough leave balance for Leave Type: %s" % \
(self.doc.leave_type,), raise_exception=1)
def validate_leave_overlap(self):
for d in webnotes.conn.sql("""select name, leave_type, posting_date,
@@ -165,7 +165,7 @@ class DocType(DocListController):
def _get_message(url=False):
name = self.doc.name
employee_name = get_fullname(employee.user_id)
employee_name = cstr(employee.employee_name)
if url:
name = get_url_to_form(self.doc.doctype, self.doc.name)
employee_name = get_url_to_form("Employee", self.doc.employee, label=employee_name)
@@ -223,9 +223,22 @@ def get_events(start, end):
events = []
employee = webnotes.conn.get_default("employee", webnotes.session.user)
company = webnotes.conn.get_default("company", webnotes.session.user)
add_department_leaves(events, start, end, employee, company)
from webnotes.widgets.reportview import build_match_conditions
match_conditions = build_match_conditions({"doctype": "Leave Application"})
# show department leaves for employee
show_department_leaves = match_conditions and \
len(match_conditions.split("or"))==1 and "employee" in match_conditions
if show_department_leaves:
add_department_leaves(events, start, end, employee, company)
else:
add_leaves(events, start, end, employee, company, match_conditions)
add_block_dates(events, start, end, employee, company)
add_holidays(events, start, end, employee, company)
return events
def add_department_leaves(events, start, end, employee, company):
@@ -235,27 +248,33 @@ def add_department_leaves(events, start, end, employee, company):
return
# department leaves
department_employees = webnotes.conn.sql_list("select name from tabEmployee where department=%s",
department)
department_employees = webnotes.conn.sql_list("""select name from tabEmployee where department=%s
and company=%s""", (department, company))
for d in webnotes.conn.sql("""select name, from_date, to_date, employee_name, half_day,
status, employee
match_conditions = "employee in (\"%s\")" % '", "'.join(department_employees)
add_leaves(events, start, end, employee, company, match_conditions=match_conditions)
def add_leaves(events, start, end, employee, company, match_conditions=None):
query = """select name, from_date, to_date, employee_name, half_day,
status, employee, docstatus
from `tabLeave Application` where
(from_date between %s and %s or to_date between %s and %s)
and docstatus < 2
and status!="Rejected"
and employee in ('%s')""" % ("%s", "%s", "%s", "%s", "', '".join(department_employees)),
(start, end, start, end), as_dict=True):
events.append({
"name": d.name,
"doctype": "Leave Application",
"from_date": d.from_date,
"to_date": d.to_date,
"status": d.status,
"title": _("Leave by") + " " + d.employee_name + \
(d.half_day and _(" (Half Day)") or "")
})
and status!="Rejected" """
if match_conditions:
query += " and " + match_conditions
for d in webnotes.conn.sql(query, (start, end, start, end), as_dict=True):
events.append({
"name": d.name,
"doctype": "Leave Application",
"from_date": d.from_date,
"to_date": d.to_date,
"status": d.status,
"title": _("Leave by") + " " + cstr(d.employee_name) + \
(d.half_day and _(" (Half Day)") or ""),
"docstatus": d.docstatus
})
def add_block_dates(events, start, end, employee, company):
# block days
@@ -272,4 +291,18 @@ def add_block_dates(events, start, end, employee, company):
"name": "_" + str(cnt),
})
cnt+=1
def add_holidays(events, start, end, employee, company):
applicable_holiday_list = webnotes.conn.get_value("Employee", employee, "holiday_list")
if not applicable_holiday_list:
return
for holiday in webnotes.conn.sql("""select name, holiday_date, description
from `tabHoliday` where parent=%s and holiday_date between %s and %s""",
(applicable_holiday_list, start, end), as_dict=True):
events.append({
"doctype": "Holiday",
"from_date": holiday.holiday_date,
"title": _("Holiday") + ": " + cstr(holiday.description),
"name": holiday.name
})

38
hr/doctype/leave_application/leave_application.txt
View File

@@ -1,12 +1,13 @@
[
{
"creation": "2013-02-08 13:17:08",
"creation": "2013-02-18 17:08:32",
"docstatus": 0,
"modified": "2013-02-13 12:32:27",
"modified": "2013-02-18 17:20:50",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"allow_import": 1,
"autoname": "LAP/.#####",
"description": "Apply / Approve Leaves",
"doctype": "DocType",
@@ -44,7 +45,7 @@
"label": "Status",
"no_copy": 1,
"options": "Open\nApproved\nRejected",
"permlevel": 2
"permlevel": 1
},
{
"description": "Leave can be approved by users with Role, \"Leave Approver\"",
@@ -217,15 +218,6 @@
"role": "Employee",
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 1,
"role": "All",
"submit": 0
},
{
"amend": 1,
"cancel": 1,
@@ -254,8 +246,17 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 2,
"report": 1,
"permlevel": 1,
"role": "All",
"submit": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 1,
"report": 0,
"role": "HR User",
"submit": 0,
"write": 1
@@ -265,15 +266,10 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 2,
"report": 1,
"permlevel": 1,
"report": 0,
"role": "Leave Approver",
"submit": 0,
"write": 1
},
{
"doctype": "DocPerm",
"permlevel": 2,
"role": "Employee"
}
]