nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-16 18:24:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved merge conflicts

Browse Source
This commit is contained in:
Saurabh
2018-07-06 13:18:44 +05:30
parent da486eeebd 0b9129e519
commit 1cfcf70905
30 changed files with 237 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/hr/doctype/appraisal/appraisal.js
View File

@@ -24,6 +24,7 @@ cur_frm.cscript.refresh = function(doc,cdt,cdn){
}
cur_frm.cscript.kra_template = function(doc, dt, dn) {
doc.goals = [];
erpnext.utils.map_current_doc({
method: "erpnext.hr.doctype.appraisal.appraisal.fetch_appraisal_template",
source_name: cur_frm.doc.kra_template,

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

@@ -356,7 +356,7 @@ class LeaveApplication(Document):
@frappe.whitelist()
def get_number_of_leave_days(employee, leave_type, from_date, to_date, half_day = None, half_day_date = None):
number_of_days = 0
if half_day == 1:
if cint(half_day) == 1:
if from_date == to_date:
number_of_days = 0.5
else: