removed debug mode
This commit is contained in:
parent
7adf17e95d
commit
92af22aa12
@ -16,6 +16,7 @@
|
||||
|
||||
cur_frm.add_fetch('employee','employee_name','employee_name');
|
||||
|
||||
|
||||
cur_frm.cscript.onload = function(doc, dt, dn) {
|
||||
if(!doc.posting_date)
|
||||
set_multiple(dt,dn,{posting_date:get_today()});
|
||||
|
@ -104,14 +104,14 @@ def get_leave_balance(employee, leave_type, fiscal_year):
|
||||
leave_all = webnotes.conn.sql("""select total_leaves_allocated
|
||||
from `tabLeave Allocation` where employee = %s and leave_type = %s
|
||||
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_app = webnotes.conn.sql("""select SUM(total_leave_days)
|
||||
from `tabLeave Application`
|
||||
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
|
||||
|
||||
ret = {'leave_balance': leave_all - leave_app}
|
||||
|
@ -2,9 +2,9 @@
|
||||
{
|
||||
"owner": "Administrator",
|
||||
"docstatus": 0,
|
||||
"creation": "2012-12-07 18:27:12",
|
||||
"creation": "2012-12-10 10:25:20",
|
||||
"modified_by": "Administrator",
|
||||
"modified": "2012-12-07 18:47:48"
|
||||
"modified": "2012-12-18 11:06:53"
|
||||
},
|
||||
{
|
||||
"is_submittable": 1,
|
||||
@ -160,7 +160,7 @@
|
||||
"search_index": 0,
|
||||
"doctype": "DocField",
|
||||
"label": "Fiscal Year",
|
||||
"options": "Link:Fiscal Year",
|
||||
"options": "link:Fiscal Year",
|
||||
"fieldname": "fiscal_year",
|
||||
"fieldtype": "Select",
|
||||
"reqd": 1,
|
||||
@ -239,5 +239,10 @@
|
||||
"role": "Leave Approver",
|
||||
"cancel": 0,
|
||||
"permlevel": 2
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm",
|
||||
"role": "All",
|
||||
"permlevel": 3
|
||||
}
|
||||
]
|
Loading…
x
Reference in New Issue
Block a user