schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: update import paths for HR

Browse Source
This commit is contained in:
Rucha Mahabal
2022-06-15 12:43:45 +05:30
parent 8b2d045b06
commit 3fe2ef6790
15 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/assets/doctype/asset_movement/test_asset_movement.py
View File

@@ -7,7 +7,7 @@ import frappe
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

4
erpnext/controllers/employee_boarding_controller.py
View File

@@ -7,8 +7,8 @@ from frappe.desk.form import assign_to
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):

6
erpnext/hooks.py
View File

@@ -256,7 +256,7 @@ sounds = [
]
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 @@ doc_events = {
},
"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",
],
},

2
erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
View File

@@ -5,7 +5,7 @@ import frappe
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

2
erpnext/projects/doctype/project/project.py
View File

@@ -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 frappe.utils import add_days, flt, get_datetime, get_time, get_url, nowtime
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):

2
erpnext/projects/doctype/timesheet/test_timesheet.py
View File

@@ -8,7 +8,6 @@ import frappe
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 @@ from erpnext.projects.doctype.timesheet.timesheet import (
make_salary_slip,
make_sales_invoice,
)
from erpnext.setup.doctype.employee.test_employee import make_employee
class TestTimesheet(unittest.TestCase):

2
erpnext/projects/report/employee_hours_utilization_based_on_timesheet/test_employee_util.py
View File

@@ -3,11 +3,11 @@ import unittest
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):

2
erpnext/projects/report/project_profitability/test_project_profitability.py
View File

@@ -2,13 +2,13 @@ import frappe
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):

4
erpnext/setup/doctype/department/department_tree.js
View File

@@ -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",

2
erpnext/setup/doctype/employee/employee.js
View File

@@ -103,7 +103,7 @@ frappe.ui.form.on('Employee', {
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

2
erpnext/setup/doctype/employee/employee_tree.js
View File

@@ -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",

2
erpnext/setup/doctype/employee/test_employee.py
View File

@@ -7,7 +7,7 @@ import frappe
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")

2
erpnext/setup/doctype/employee_group/test_employee_group.py
View File

@@ -5,7 +5,7 @@ import unittest
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):

2
erpnext/setup/doctype/holiday_list/holiday_list_calendar.js
View File

@@ -10,7 +10,7 @@ frappe.views.calendar["Holiday List"] = {
"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',

2
erpnext/tests/test_exotel.py
View File

@@ -2,7 +2,7 @@ import frappe
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):