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

chore: sort imports, remove unused imports

Browse Source
This commit is contained in:
Rucha Mahabal 2022-02-23 11:22:58 +05:30
parent 4ef2911953
commit f2ee36579b
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,8 @@
import frappe import frappe
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.utils import cint, cstr, formatdate, get_datetime, get_link_to_form, getdate, nowdate
from frappe.query_builder import Criterion from frappe.query_builder import Criterion
from frappe.utils import cint, cstr, formatdate, get_datetime, get_link_to_form, getdate, nowdate
from erpnext.hr.utils import get_holiday_dates_for_employee, validate_active_employee from erpnext.hr.utils import get_holiday_dates_for_employee, validate_active_employee

9
erpnext/hr/doctype/shift_assignment/shift_assignment.py
View File

@ -3,19 +3,18 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from typing import Dict, List
import frappe import frappe
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.query_builder import Criterion, Column from frappe.query_builder import Criterion
from frappe.utils import cstr, get_link_to_form, get_datetime, get_time, getdate, now_datetime, nowdate from frappe.utils import cstr, get_datetime, get_link_to_form, get_time, getdate, now_datetime
from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
from erpnext.hr.doctype.holiday_list.holiday_list import is_holiday from erpnext.hr.doctype.holiday_list.holiday_list import is_holiday
from erpnext.hr.utils import validate_active_employee from erpnext.hr.utils import validate_active_employee
from typing import Dict, List
class OverlappingShiftError(frappe.ValidationError): class OverlappingShiftError(frappe.ValidationError):
pass pass
@ -374,7 +373,7 @@ def get_exact_shift(shifts: List, for_timestamp: datetime) -> Dict:
timestamp_index = index timestamp_index = index
elif for_timestamp == timestamp: elif for_timestamp == timestamp:
# on timestamp boundary # on timestamp boundary
if index%2 == 1: if index % 2 == 1:
timestamp_index = index timestamp_index = index
else: else:
timestamp_index = index + 1 timestamp_index = index + 1

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

@ -19,7 +19,7 @@ from erpnext.hr.doctype.employee_checkin.employee_checkin import (
from erpnext.hr.doctype.holiday_list.holiday_list import is_holiday from erpnext.hr.doctype.holiday_list.holiday_list import is_holiday
from erpnext.hr.doctype.shift_assignment.shift_assignment import ( from erpnext.hr.doctype.shift_assignment.shift_assignment import (
get_employee_shift, get_employee_shift,
get_shift_details get_shift_details,
) )