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

chore: Update imports/paths for doctypes moved to erpnext setup module

Browse Source
This commit is contained in:
Rucha Mahabal 2022-06-10 15:06:54 +05:30
parent 0d34e589fd
commit 512c82f76d
31 changed files with 629 additions and 639 deletions
Show Stats 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 erpnext.hr.doctype.employee.test_employee import make_employee
from employee.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 erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
from erpnext.hr.doctype.holiday_list.holiday_list import is_holiday
from employee.setup.doctype.employee.employee import get_holiday_list_for_employee
from employee.setup.doctype.holiday_list.holiday_list import is_holiday
class EmployeeBoardingController(Document):

26
erpnext/hooks.py
View File

@ -80,7 +80,7 @@ calendars = [
"Holiday List",
]
website_generators = ["Item Group", "Website Item", "BOM", "Sales Partner", "Job Opening"]
website_generators = ["Item Group", "Website Item", "BOM", "Sales Partner"]
website_context = {
"favicon": "/assets/erpnext/images/erpnext-favicon.svg",
@ -163,7 +163,6 @@ website_route_rules = [
"to_route": "addresses",
"defaults": {"doctype": "Address", "parents": [{"label": _("Addresses"), "route": "addresses"}]},
},
{"from_route": "/jobs", "to_route": "Job Opening"},
{"from_route": "/boms", "to_route": "BOM"},
{"from_route": "/timesheets", "to_route": "Timesheet"},
{"from_route": "/material-requests", "to_route": "Material Request"},
@ -256,7 +255,7 @@ sounds = [
{"name": "call-disconnect", "src": "/assets/erpnext/sounds/call-disconnect.mp3", "volume": 0.2},
]
has_upload_permission = {"Employee": "erpnext.hr.doctype.employee.employee.has_upload_permission"}
has_upload_permission = {"Employee": "employee.setup.doctype.employee.employee.has_upload_permission"}
has_website_permission = {
"Sales Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
@ -289,9 +288,9 @@ doc_events = {
},
"User": {
"after_insert": "frappe.contacts.doctype.contact.contact.update_contact",
"validate": "erpnext.hr.doctype.employee.employee.validate_employee_role",
"validate": "employee.setup.doctype.employee.employee.validate_employee_role",
"on_update": [
"erpnext.hr.doctype.employee.employee.update_user_permissions",
"employee.setup.doctype.employee.employee.update_user_permissions",
"erpnext.portal.utils.set_default_role",
],
},
@ -420,8 +419,8 @@ scheduler_events = {
"erpnext.crm.doctype.opportunity.opportunity.auto_close_opportunity",
"erpnext.controllers.accounts_controller.update_invoice_status",
"erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year",
"erpnext.hr.doctype.employee.employee_reminders.send_work_anniversary_reminders",
"erpnext.hr.doctype.employee.employee_reminders.send_birthday_reminders",
"employee.setup.doctype.employee.employee_reminders.send_work_anniversary_reminders",
"employee.setup.doctype.employee.employee_reminders.send_birthday_reminders",
"erpnext.projects.doctype.task.task.set_tasks_as_overdue",
"erpnext.assets.doctype.asset.depreciation.post_depreciation_entries",
"erpnext.hr.doctype.daily_work_summary_group.daily_work_summary_group.send_summary",
@ -452,8 +451,8 @@ scheduler_events = {
"erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual.process_loan_interest_accrual_for_term_loans",
"erpnext.crm.doctype.lead.lead.daily_open_lead",
],
"weekly": ["erpnext.hr.doctype.employee.employee_reminders.send_reminders_in_advance_weekly"],
"monthly": ["erpnext.hr.doctype.employee.employee_reminders.send_reminders_in_advance_monthly"],
"weekly": ["employee.setup.doctype.employee.employee_reminders.send_reminders_in_advance_weekly"],
"monthly": ["employee.setup.doctype.employee.employee_reminders.send_reminders_in_advance_monthly"],
"monthly_long": [
"erpnext.accounts.deferred_revenue.process_deferred_accounting",
"erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual.process_loan_interest_accrual_for_demand_loans",
@ -591,9 +590,6 @@ global_search_doctypes = {
{"doctype": "Material Request", "index": 16},
{"doctype": "Delivery Trip", "index": 17},
{"doctype": "Pick List", "index": 18},
{"doctype": "Salary Slip", "index": 19},
{"doctype": "Leave Application", "index": 20},
{"doctype": "Expense Claim", "index": 21},
{"doctype": "Payment Entry", "index": 22},
{"doctype": "Lead", "index": 23},
{"doctype": "Opportunity", "index": 24},
@ -609,13 +605,7 @@ global_search_doctypes = {
{"doctype": "Batch", "index": 34},
{"doctype": "Branch", "index": 35},
{"doctype": "Department", "index": 36},
{"doctype": "Employee Grade", "index": 37},
{"doctype": "Designation", "index": 38},
{"doctype": "Job Opening", "index": 39},
{"doctype": "Job Applicant", "index": 40},
{"doctype": "Job Offer", "index": 41},
{"doctype": "Salary Structure Assignment", "index": 42},
{"doctype": "Appraisal", "index": 43},
{"doctype": "Loan", "index": 44},
{"doctype": "Maintenance Schedule", "index": 45},
{"doctype": "Maintenance Visit", "index": 46},

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 erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
from employee.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

@ -13,7 +13,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.hr.doctype.daily_work_summary.daily_work_summary import get_users_email
from erpnext.hr.doctype.holiday_list.holiday_list import is_holiday
from employee.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,7 @@ 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 erpnext.hr.doctype.employee.test_employee import make_employee
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,

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

@ -3,7 +3,7 @@ import unittest
import frappe
from frappe.utils.make_random import get_random
from erpnext.hr.doctype.employee.test_employee import make_employee
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,

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

@ -2,7 +2,7 @@ import frappe
from frappe.tests.utils import FrappeTestCase
from frappe.utils import add_days, getdate
from erpnext.hr.doctype.employee.test_employee import make_employee
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,

2
erpnext/setup/doctype/branch/branch.json
View File

@ -51,7 +51,7 @@
"max_attachments": 0,
"modified": "2016-07-25 05:24:26.534086",
"modified_by": "Administrator",
"module": "HR",
"module": "Setup",
"name": "Branch",
"owner": "Administrator",
"permissions": [

2
erpnext/setup/doctype/department/department.json
View File

@ -109,7 +109,7 @@
"links": [],
"modified": "2020-06-10 12:28:00.563272",
"modified_by": "Administrator",
"module": "HR",
"module": "Setup",
"name": "Department",
"nsm_parent_field": "parent_department",
"owner": "Administrator",

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: 'erpnext.hr.doctype.department.department.get_children',
add_tree_node: 'erpnext.hr.doctype.department.department.add_node',
get_tree_nodes: 'employee.setup.doctype.department.department.get_children',
add_tree_node: 'employee.setup.doctype.department.department.add_node',
filters: [
{
fieldname: "company",

2
erpnext/setup/doctype/designation/designation.json
View File

@ -160,7 +160,7 @@
"menu_index": 0,
"modified": "2019-04-16 10:02:23.277734",
"modified_by": "Administrator",
"module": "HR",
"module": "Setup",
"name": "Designation",
"owner": "Administrator",
"permissions": [

2
erpnext/setup/doctype/designation_skill/designation_skill.json
View File

@ -58,7 +58,7 @@
"max_attachments": 0,
"modified": "2019-04-16 13:42:10.760449",
"modified_by": "Administrator",
"module": "HR",
"module": "Setup",
"name": "Designation Skill",
"name_case": "",
"owner": "Administrator",

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: "erpnext.hr.doctype.employee.employee.create_user",
method: "employee.setup.doctype.employee.employee.create_user",
args: {
employee: frm.doc.name,
email: frm.doc.prefered_email

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

@ -777,7 +777,7 @@
"links": [],
"modified": "2022-06-10 12:28:55.811983",
"modified_by": "Administrator",
"module": "HR",
"module": "Setup",
"name": "Employee",
"name_case": "Title Case",
"naming_rule": "By \"Naming Series\" field",

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

@ -5,7 +5,7 @@ import frappe
from frappe import _
from frappe.utils import add_days, add_months, comma_sep, getdate, today
from erpnext.hr.doctype.employee.employee import get_all_employee_emails, get_employee_email
from employee.setup.doctype.employee.employee import get_all_employee_emails, get_employee_email
from erpnext.hr.utils import get_holidays_for_employee

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

@ -1,5 +1,5 @@
frappe.treeview_settings['Employee'] = {
get_tree_nodes: "erpnext.hr.doctype.employee.employee.get_children",
get_tree_nodes: "employee.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 erpnext.hr.doctype.employee.employee import InactiveEmployeeStatusError
from employee.setup.doctype.employee.employee import InactiveEmployeeStatusError
test_records = frappe.get_test_records("Employee")

18
erpnext/setup/doctype/employee/test_employee_reminders.py
View File

@ -7,8 +7,8 @@ from datetime import timedelta
import frappe
from frappe.utils import add_months, getdate
from erpnext.hr.doctype.employee.employee_reminders import send_holidays_reminder_in_advance
from erpnext.hr.doctype.employee.test_employee import make_employee
from employee.setup.doctype.employee.employee_reminders import send_holidays_reminder_in_advance
from employee.setup.doctype.employee.test_employee import make_employee
from erpnext.hr.doctype.hr_settings.hr_settings import set_proceed_with_frequency_change
from erpnext.hr.utils import get_holidays_for_employee
@ -16,7 +16,7 @@ from erpnext.hr.utils import get_holidays_for_employee
class TestEmployeeReminders(unittest.TestCase):
@classmethod
def setUpClass(cls):
from erpnext.hr.doctype.holiday_list.test_holiday_list import make_holiday_list
from employee.setup.doctype.holiday_list.test_holiday_list import make_holiday_list
# Create a test holiday list
test_holiday_dates = cls.get_test_holiday_dates()
@ -83,7 +83,7 @@ class TestEmployeeReminders(unittest.TestCase):
frappe.db.sql("delete from `tabEmail Queue Recipient`")
def test_is_holiday(self):
from erpnext.hr.doctype.employee.employee import is_holiday
from employee.setup.doctype.employee.employee import is_holiday
self.assertTrue(is_holiday(self.test_employee.name))
self.assertTrue(is_holiday(self.test_employee.name, date=self.test_holiday_dates[1]))
@ -109,7 +109,7 @@ class TestEmployeeReminders(unittest.TestCase):
employee.company = "_Test Company"
employee.save()
from erpnext.hr.doctype.employee.employee_reminders import (
from employee.setup.doctype.employee.employee_reminders import (
get_employees_who_are_born_today,
send_birthday_reminders,
)
@ -133,7 +133,7 @@ class TestEmployeeReminders(unittest.TestCase):
company="_Test Company",
)
from erpnext.hr.doctype.employee.employee_reminders import (
from employee.setup.doctype.employee.employee_reminders import (
get_employees_having_an_event_today,
send_work_anniversary_reminders,
)
@ -162,7 +162,7 @@ class TestEmployeeReminders(unittest.TestCase):
company="_Test Company",
)
from erpnext.hr.doctype.employee.employee_reminders import get_employees_having_an_event_today
from employee.setup.doctype.employee.employee_reminders import get_employees_having_an_event_today
employees_having_work_anniversary = get_employees_having_an_event_today("work_anniversary")
employees = employees_having_work_anniversary.get("_Test Company") or []
@ -190,7 +190,7 @@ class TestEmployeeReminders(unittest.TestCase):
self.assertTrue("Holidays this Week." in email_queue[0].message)
def test_advance_holiday_reminders_monthly(self):
from erpnext.hr.doctype.employee.employee_reminders import send_reminders_in_advance_monthly
from employee.setup.doctype.employee.employee_reminders import send_reminders_in_advance_monthly
setup_hr_settings("Monthly")
@ -217,7 +217,7 @@ class TestEmployeeReminders(unittest.TestCase):
)
def test_advance_holiday_reminders_weekly(self):
from erpnext.hr.doctype.employee.employee_reminders import send_reminders_in_advance_weekly
from employee.setup.doctype.employee.employee_reminders import send_reminders_in_advance_weekly
setup_hr_settings("Weekly")

2
erpnext/setup/doctype/employee_education/employee_education.json
View File

@ -181,7 +181,7 @@
"max_attachments": 0,
"modified": "2016-07-11 03:27:59.995464",
"modified_by": "Administrator",
"module": "HR",
"module": "Setup",
"name": "Employee Education",
"owner": "Administrator",
"permissions": [],

2
erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json
View File

@ -179,7 +179,7 @@
"max_attachments": 0,
"modified": "2016-07-11 03:28:00.088980",
"modified_by": "Administrator",
"module": "HR",
"module": "Setup",
"name": "Employee External Work History",
"owner": "Administrator",
"permissions": [],

2
erpnext/setup/doctype/employee_group/employee_group.json
View File

@ -125,7 +125,7 @@
"max_attachments": 0,
"modified": "2018-12-27 19:52:34.791538",
"modified_by": "Administrator",
"module": "HR",
"module": "Setup",
"name": "Employee Group",
"name_case": "",
"owner": "Administrator",

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

@ -5,7 +5,7 @@ import unittest
import frappe
from erpnext.hr.doctype.employee.test_employee import make_employee
from employee.setup.doctype.employee.test_employee import make_employee
class TestEmployeeGroup(unittest.TestCase):

2
erpnext/setup/doctype/employee_group_table/employee_group_table.json
View File

@ -35,7 +35,7 @@
"istable": 1,
"modified": "2022-02-13 19:44:21.302938",
"modified_by": "Administrator",
"module": "HR",
"module": "Setup",
"name": "Employee Group Table",
"owner": "Administrator",
"permissions": [],

2
erpnext/setup/doctype/employee_internal_work_history/employee_internal_work_history.json
View File

@ -155,7 +155,7 @@
"max_attachments": 0,
"modified": "2016-07-11 03:28:00.195130",
"modified_by": "Administrator",
"module": "HR",
"module": "Setup",
"name": "Employee Internal Work History",
"owner": "Administrator",
"permissions": [],

2
erpnext/setup/doctype/holiday/holiday.json
View File

@ -51,7 +51,7 @@
"links": [],
"modified": "2020-04-18 19:03:23.507845",
"modified_by": "Administrator",
"module": "HR",
"module": "Setup",
"name": "Holiday",
"owner": "Administrator",
"permissions": [],

2
erpnext/setup/doctype/holiday_list/holiday_list.json
View File

@ -444,7 +444,7 @@
"max_attachments": 0,
"modified": "2018-07-03 07:22:46.474096",
"modified_by": "Administrator",
"module": "HR",
"module": "Setup",
"name": "Holiday List",
"owner": "Administrator",
"permissions": [

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: "erpnext.hr.doctype.holiday_list.holiday_list.get_events",
get_events_method: "employee.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 erpnext.hr.doctype.employee.test_employee import make_employee
from employee.setup.doctype.employee.test_employee import make_employee
class TestExotel(FrappeAPITestCase):

0
erpnext/www/lms/__init__.py Normal file
View File

0
erpnext/www/lms/macros/__init__.py Normal file
View File