Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi 2013-03-01 15:12:53 +05:30
commit 9568d869f8
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hr/doctype/attendance_control_panel/attendance_control_panel.py
View File

@ -16,12 +16,8 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import webnotes import webnotes
import webnotes.default from webnotes.utils import cint, cstr, formatdate, getdate
from webnotes import msgprint
from webnotes.utils import cint, cstr, date_diff, formatdate, getdate, now
from webnotes.model import db_exists
from webnotes.model.bean import copy_doclist
from webnotes import form, msgprint
sql = webnotes.conn.sql sql = webnotes.conn.sql
@ -49,13 +45,8 @@ class DocType:
# get date list inbetween from date and to date # get date list inbetween from date and to date
def date_diff_list(self): def date_diff_list(self):
import datetime import datetime
#get from date
att_fr_date = self.doc.att_fr_date and self.doc.att_fr_date or ''
#get to date if self.doc.att_to_date:
att_to_date = self.doc.att_to_date and self.doc.att_to_date or ''
if att_to_date:
r = (getdate(self.doc.att_to_date)+datetime.timedelta(days=1)-getdate(self.doc.att_fr_date)).days r = (getdate(self.doc.att_to_date)+datetime.timedelta(days=1)-getdate(self.doc.att_fr_date)).days
else: else:
r = 1 r = 1
@ -65,6 +56,7 @@ class DocType:
return dt return dt
def get_att_data(self): def get_att_data(self):
import webnotes.defaults
fy = webnotes.defaults.get_global_default('fiscal_year') fy = webnotes.defaults.get_global_default('fiscal_year')
comp = webnotes.defaults.get_user_default('company') comp = webnotes.defaults.get_user_default('company')