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

Merge branch 'staging-fixes' into report-fix

Browse Source
This commit is contained in:
Deepesh Garg 2019-01-06 12:16:11 +05:30 committed by GitHub
commit b12c7358b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hooks.py
View File

@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
develop_version = '12.x.x-develop'
staging_version = '11.0.3-beta.32'
staging_version = '11.0.3-beta.33'
error_report_email = "support@erpnext.com"

1
erpnext/hr/doctype/upload_attendance/test_upload_attendance.py
View File

@ -29,6 +29,5 @@ class TestUploadAttendance(unittest.TestCase):
for row in data:
if row[1] == employee:
filtered_data.append(row)
print(filtered_data)
for row in filtered_data:
self.assertTrue(getdate(row[3]) >= getdate(date_of_joining) and getdate(row[3]) <= getdate(relieving_date))