chore: update import paths for HR
diff --git a/erpnext/assets/doctype/asset_movement/test_asset_movement.py b/erpnext/assets/doctype/asset_movement/test_asset_movement.py
index 42746e2..72c0575 100644
--- a/erpnext/assets/doctype/asset_movement/test_asset_movement.py
+++ b/erpnext/assets/doctype/asset_movement/test_asset_movement.py
@@ -7,7 +7,7 @@
from frappe.utils import now
from erpnext.assets.doctype.asset.test_asset import create_asset_data
-from employee.setup.doctype.employee.test_employee import make_employee
+from erpnext.setup.doctype.employee.test_employee import make_employee
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
diff --git a/erpnext/controllers/employee_boarding_controller.py b/erpnext/controllers/employee_boarding_controller.py
index ae9ae38..c06fb59 100644
--- a/erpnext/controllers/employee_boarding_controller.py
+++ b/erpnext/controllers/employee_boarding_controller.py
@@ -7,8 +7,8 @@
from frappe.model.document import Document
from frappe.utils import add_days, flt, unique
-from employee.setup.doctype.employee.employee import get_holiday_list_for_employee
-from employee.setup.doctype.holiday_list.holiday_list import is_holiday
+from erpnext.setup.doctype.employee.employee import get_holiday_list_for_employee
+from erpnext.setup.doctype.holiday_list.holiday_list import is_holiday
class EmployeeBoardingController(Document):
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index ac52996..191a4c9 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -256,7 +256,7 @@
]
has_upload_permission = {
- "Employee": "employee.setup.doctype.employee.employee.has_upload_permission"
+ "Employee": "erpnext.setup.doctype.employee.employee.has_upload_permission"
}
has_website_permission = {
@@ -290,9 +290,9 @@
},
"User": {
"after_insert": "frappe.contacts.doctype.contact.contact.update_contact",
- "validate": "employee.setup.doctype.employee.employee.validate_employee_role",
+ "validate": "erpnext.setup.doctype.employee.employee.validate_employee_role",
"on_update": [
- "employee.setup.doctype.employee.employee.update_user_permissions",
+ "erpnext.setup.doctype.employee.employee.update_user_permissions",
"erpnext.portal.utils.set_default_role",
],
},
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
index 4dfe15c..09d4429 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -5,7 +5,7 @@
from frappe import _, throw
from frappe.utils import add_days, cint, cstr, date_diff, formatdate, getdate
-from employee.setup.doctype.employee.employee import get_holiday_list_for_employee
+from erpnext.setup.doctype.employee.employee import get_holiday_list_for_employee
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.utils import get_valid_serial_nos
from erpnext.utilities.transaction_base import TransactionBase, delete_events
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index dbdaed5..b1fd1d9 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -4,7 +4,6 @@
import frappe
from email_reply_parser import EmailReplyParser
-from employee.setup.doctype.holiday_list.holiday_list import is_holiday
from frappe import _
from frappe.desk.reportview import get_match_cond
from frappe.model.document import Document
@@ -13,6 +12,7 @@
from erpnext import get_default_company
from erpnext.controllers.employee_boarding_controller import update_employee_boarding_status
from erpnext.controllers.queries import get_filters_cond
+from erpnext.setup.doctype.holiday_list.holiday_list import is_holiday
class Project(Document):
diff --git a/erpnext/projects/doctype/timesheet/test_timesheet.py b/erpnext/projects/doctype/timesheet/test_timesheet.py
index bd4bdc5..b366a00 100644
--- a/erpnext/projects/doctype/timesheet/test_timesheet.py
+++ b/erpnext/projects/doctype/timesheet/test_timesheet.py
@@ -8,7 +8,6 @@
from frappe.utils import add_months, add_to_date, now_datetime, nowdate
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-from employee.setup.doctype.employee.test_employee import make_employee
from erpnext.payroll.doctype.salary_slip.test_salary_slip import (
make_deduction_salary_component,
make_earning_salary_component,
@@ -22,6 +21,7 @@
make_salary_slip,
make_sales_invoice,
)
+from erpnext.setup.doctype.employee.test_employee import make_employee
class TestTimesheet(unittest.TestCase):
diff --git a/erpnext/projects/report/employee_hours_utilization_based_on_timesheet/test_employee_util.py b/erpnext/projects/report/employee_hours_utilization_based_on_timesheet/test_employee_util.py
index 96c6d6a..98fa6f0 100644
--- a/erpnext/projects/report/employee_hours_utilization_based_on_timesheet/test_employee_util.py
+++ b/erpnext/projects/report/employee_hours_utilization_based_on_timesheet/test_employee_util.py
@@ -3,11 +3,11 @@
import frappe
from frappe.utils.make_random import get_random
-from employee.setup.doctype.employee.test_employee import make_employee
from erpnext.projects.doctype.project.test_project import make_project
from erpnext.projects.report.employee_hours_utilization_based_on_timesheet.employee_hours_utilization_based_on_timesheet import (
execute,
)
+from erpnext.setup.doctype.employee.test_employee import make_employee
class TestEmployeeUtilization(unittest.TestCase):
diff --git a/erpnext/projects/report/project_profitability/test_project_profitability.py b/erpnext/projects/report/project_profitability/test_project_profitability.py
index 9e827e3..381d639 100644
--- a/erpnext/projects/report/project_profitability/test_project_profitability.py
+++ b/erpnext/projects/report/project_profitability/test_project_profitability.py
@@ -2,13 +2,13 @@
from frappe.tests.utils import FrappeTestCase
from frappe.utils import add_days, getdate
-from employee.setup.doctype.employee.test_employee import make_employee
from erpnext.projects.doctype.timesheet.test_timesheet import (
make_salary_structure_for_timesheet,
make_timesheet,
)
from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice
from erpnext.projects.report.project_profitability.project_profitability import execute
+from erpnext.setup.doctype.employee.test_employee import make_employee
class TestProjectProfitability(FrappeTestCase):
diff --git a/erpnext/setup/doctype/department/department_tree.js b/erpnext/setup/doctype/department/department_tree.js
index 6cae8a5..9c1341b 100644
--- a/erpnext/setup/doctype/department/department_tree.js
+++ b/erpnext/setup/doctype/department/department_tree.js
@@ -1,7 +1,7 @@
frappe.treeview_settings["Department"] = {
ignore_fields:["parent_department"],
- get_tree_nodes: 'employee.setup.doctype.department.department.get_children',
- add_tree_node: 'employee.setup.doctype.department.department.add_node',
+ get_tree_nodes: 'erpnext.setup.doctype.department.department.get_children',
+ add_tree_node: 'erpnext.setup.doctype.department.department.add_node',
filters: [
{
fieldname: "company",
diff --git a/erpnext/setup/doctype/employee/employee.js b/erpnext/setup/doctype/employee/employee.js
index 4697d68..7c62def 100755
--- a/erpnext/setup/doctype/employee/employee.js
+++ b/erpnext/setup/doctype/employee/employee.js
@@ -103,7 +103,7 @@
frappe.throw(__("Please enter Preferred Contact Email"));
}
frappe.call({
- method: "employee.setup.doctype.employee.employee.create_user",
+ method: "erpnext.setup.doctype.employee.employee.create_user",
args: {
employee: frm.doc.name,
email: frm.doc.prefered_email
diff --git a/erpnext/setup/doctype/employee/employee_tree.js b/erpnext/setup/doctype/employee/employee_tree.js
index 029210a..8f52cff 100644
--- a/erpnext/setup/doctype/employee/employee_tree.js
+++ b/erpnext/setup/doctype/employee/employee_tree.js
@@ -1,5 +1,5 @@
frappe.treeview_settings['Employee'] = {
- get_tree_nodes: "employee.setup.doctype.employee.employee.get_children",
+ get_tree_nodes: "erpnext.setup.doctype.employee.employee.get_children",
filters: [
{
fieldname: "company",
diff --git a/erpnext/setup/doctype/employee/test_employee.py b/erpnext/setup/doctype/employee/test_employee.py
index c4911ad..38c4d61 100644
--- a/erpnext/setup/doctype/employee/test_employee.py
+++ b/erpnext/setup/doctype/employee/test_employee.py
@@ -7,7 +7,7 @@
import frappe.utils
import erpnext
-from employee.setup.doctype.employee.employee import InactiveEmployeeStatusError
+from erpnext.setup.doctype.employee.employee import InactiveEmployeeStatusError
test_records = frappe.get_test_records("Employee")
diff --git a/erpnext/setup/doctype/employee_group/test_employee_group.py b/erpnext/setup/doctype/employee_group/test_employee_group.py
index de57b5f..4a19792 100644
--- a/erpnext/setup/doctype/employee_group/test_employee_group.py
+++ b/erpnext/setup/doctype/employee_group/test_employee_group.py
@@ -5,7 +5,7 @@
import frappe
-from employee.setup.doctype.employee.test_employee import make_employee
+from erpnext.setup.doctype.employee.test_employee import make_employee
class TestEmployeeGroup(unittest.TestCase):
diff --git a/erpnext/setup/doctype/holiday_list/holiday_list_calendar.js b/erpnext/setup/doctype/holiday_list/holiday_list_calendar.js
index a30c20a..bb6d831 100644
--- a/erpnext/setup/doctype/holiday_list/holiday_list_calendar.js
+++ b/erpnext/setup/doctype/holiday_list/holiday_list_calendar.js
@@ -10,7 +10,7 @@
"allDay": "allDay"
},
order_by: `from_date`,
- get_events_method: "employee.setup.doctype.holiday_list.holiday_list.get_events",
+ get_events_method: "erpnext.setup.doctype.holiday_list.holiday_list.get_events",
filters: [
{
'fieldtype': 'Link',
diff --git a/erpnext/tests/test_exotel.py b/erpnext/tests/test_exotel.py
index 1f06d33..1b4299c 100644
--- a/erpnext/tests/test_exotel.py
+++ b/erpnext/tests/test_exotel.py
@@ -2,7 +2,7 @@
from frappe.contacts.doctype.contact.test_contact import create_contact
from frappe.tests.test_api import FrappeAPITestCase
-from employee.setup.doctype.employee.test_employee import make_employee
+from erpnext.setup.doctype.employee.test_employee import make_employee
class TestExotel(FrappeAPITestCase):