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

removed debug mode

Browse Source
This commit is contained in:
Nabin Hait
2012-12-18 13:45:59 +05:30
parent 7adf17e95d
commit 92af22aa12
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hr/doctype/leave_application/leave_application.js
View File

@@ -16,6 +16,7 @@
cur_frm.add_fetch('employee','employee_name','employee_name'); cur_frm.add_fetch('employee','employee_name','employee_name');
cur_frm.cscript.onload = function(doc, dt, dn) { cur_frm.cscript.onload = function(doc, dt, dn) {
if(!doc.posting_date) if(!doc.posting_date)
set_multiple(dt,dn,{posting_date:get_today()}); set_multiple(dt,dn,{posting_date:get_today()});

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

@@ -104,14 +104,14 @@ def get_leave_balance(employee, leave_type, fiscal_year):
leave_all = webnotes.conn.sql("""select total_leaves_allocated leave_all = webnotes.conn.sql("""select total_leaves_allocated
from `tabLeave Allocation` where employee = %s and leave_type = %s from `tabLeave Allocation` where employee = %s and leave_type = %s
and fiscal_year = %s and docstatus = 1""", (employee, and fiscal_year = %s and docstatus = 1""", (employee,
leave_type, fiscal_year), debug=1) leave_type, fiscal_year))
leave_all = leave_all and flt(leave_all[0][0]) or 0 leave_all = leave_all and flt(leave_all[0][0]) or 0
leave_app = webnotes.conn.sql("""select SUM(total_leave_days) leave_app = webnotes.conn.sql("""select SUM(total_leave_days)
from `tabLeave Application` from `tabLeave Application`
where employee = %s and leave_type = %s and fiscal_year = %s where employee = %s and leave_type = %s and fiscal_year = %s
and docstatus = 1""", (employee, leave_type, fiscal_year), debug=1) and docstatus = 1""", (employee, leave_type, fiscal_year))
leave_app = leave_app and flt(leave_app[0][0]) or 0 leave_app = leave_app and flt(leave_app[0][0]) or 0
ret = {'leave_balance': leave_all - leave_app} ret = {'leave_balance': leave_all - leave_app}

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

@@ -2,9 +2,9 @@
{ {
"owner": "Administrator", "owner": "Administrator",
"docstatus": 0, "docstatus": 0,
"creation": "2012-12-07 18:27:12", "creation": "2012-12-10 10:25:20",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-12-07 18:47:48" "modified": "2012-12-18 11:06:53"
}, },
{ {
"is_submittable": 1, "is_submittable": 1,
@@ -160,7 +160,7 @@
"search_index": 0, "search_index": 0,
"doctype": "DocField", "doctype": "DocField",
"label": "Fiscal Year", "label": "Fiscal Year",
"options": "Link:Fiscal Year", "options": "link:Fiscal Year",
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Select",
"reqd": 1, "reqd": 1,
@@ -239,5 +239,10 @@
"role": "Leave Approver", "role": "Leave Approver",
"cancel": 0, "cancel": 0,
"permlevel": 2 "permlevel": 2
},
{
"doctype": "DocPerm",
"role": "All",
"permlevel": 3
} }
] ]