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 frappe.utils import now
from erpnext.assets.doctype.asset.test_asset import create_asset_data 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 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.model.document import Document
from frappe.utils import add_days, flt, unique from frappe.utils import add_days, flt, unique
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.hr.doctype.holiday_list.holiday_list import is_holiday from employee.setup.doctype.holiday_list.holiday_list import is_holiday
class EmployeeBoardingController(Document): class EmployeeBoardingController(Document):

26
erpnext/hooks.py
View File

@ -80,7 +80,7 @@ calendars = [
"Holiday List", "Holiday List",
] ]
website_generators = ["Item Group", "Website Item", "BOM", "Sales Partner", "Job Opening"] website_generators = ["Item Group", "Website Item", "BOM", "Sales Partner"]
website_context = { website_context = {
"favicon": "/assets/erpnext/images/erpnext-favicon.svg", "favicon": "/assets/erpnext/images/erpnext-favicon.svg",
@ -163,7 +163,6 @@ website_route_rules = [
"to_route": "addresses", "to_route": "addresses",
"defaults": {"doctype": "Address", "parents": [{"label": _("Addresses"), "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": "/boms", "to_route": "BOM"},
{"from_route": "/timesheets", "to_route": "Timesheet"}, {"from_route": "/timesheets", "to_route": "Timesheet"},
{"from_route": "/material-requests", "to_route": "Material Request"}, {"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}, {"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 = { has_website_permission = {
"Sales Order": "erpnext.controllers.website_list_for_contact.has_website_permission", "Sales Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
@ -289,9 +288,9 @@ doc_events = {
}, },
"User": { "User": {
"after_insert": "frappe.contacts.doctype.contact.contact.update_contact", "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": [ "on_update": [
"erpnext.hr.doctype.employee.employee.update_user_permissions", "employee.setup.doctype.employee.employee.update_user_permissions",
"erpnext.portal.utils.set_default_role", "erpnext.portal.utils.set_default_role",
], ],
}, },
@ -420,8 +419,8 @@ scheduler_events = {
"erpnext.crm.doctype.opportunity.opportunity.auto_close_opportunity", "erpnext.crm.doctype.opportunity.opportunity.auto_close_opportunity",
"erpnext.controllers.accounts_controller.update_invoice_status", "erpnext.controllers.accounts_controller.update_invoice_status",
"erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year", "erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year",
"erpnext.hr.doctype.employee.employee_reminders.send_work_anniversary_reminders", "employee.setup.doctype.employee.employee_reminders.send_work_anniversary_reminders",
"erpnext.hr.doctype.employee.employee_reminders.send_birthday_reminders", "employee.setup.doctype.employee.employee_reminders.send_birthday_reminders",
"erpnext.projects.doctype.task.task.set_tasks_as_overdue", "erpnext.projects.doctype.task.task.set_tasks_as_overdue",
"erpnext.assets.doctype.asset.depreciation.post_depreciation_entries", "erpnext.assets.doctype.asset.depreciation.post_depreciation_entries",
"erpnext.hr.doctype.daily_work_summary_group.daily_work_summary_group.send_summary", "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.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", "erpnext.crm.doctype.lead.lead.daily_open_lead",
], ],
"weekly": ["erpnext.hr.doctype.employee.employee_reminders.send_reminders_in_advance_weekly"], "weekly": ["employee.setup.doctype.employee.employee_reminders.send_reminders_in_advance_weekly"],
"monthly": ["erpnext.hr.doctype.employee.employee_reminders.send_reminders_in_advance_monthly"], "monthly": ["employee.setup.doctype.employee.employee_reminders.send_reminders_in_advance_monthly"],
"monthly_long": [ "monthly_long": [
"erpnext.accounts.deferred_revenue.process_deferred_accounting", "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", "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": "Material Request", "index": 16},
{"doctype": "Delivery Trip", "index": 17}, {"doctype": "Delivery Trip", "index": 17},
{"doctype": "Pick List", "index": 18}, {"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": "Payment Entry", "index": 22},
{"doctype": "Lead", "index": 23}, {"doctype": "Lead", "index": 23},
{"doctype": "Opportunity", "index": 24}, {"doctype": "Opportunity", "index": 24},
@ -609,13 +605,7 @@ global_search_doctypes = {
{"doctype": "Batch", "index": 34}, {"doctype": "Batch", "index": 34},
{"doctype": "Branch", "index": 35}, {"doctype": "Branch", "index": 35},
{"doctype": "Department", "index": 36}, {"doctype": "Department", "index": 36},
{"doctype": "Employee Grade", "index": 37},
{"doctype": "Designation", "index": 38}, {"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": "Loan", "index": 44},
{"doctype": "Maintenance Schedule", "index": 45}, {"doctype": "Maintenance Schedule", "index": 45},
{"doctype": "Maintenance Visit", "index": 46}, {"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 import _, throw
from frappe.utils import add_days, cint, cstr, date_diff, formatdate, getdate 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.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.utils import get_valid_serial_nos from erpnext.stock.utils import get_valid_serial_nos
from erpnext.utilities.transaction_base import TransactionBase, delete_events 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.employee_boarding_controller import update_employee_boarding_status
from erpnext.controllers.queries import get_filters_cond 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.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): 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 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.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 ( from erpnext.payroll.doctype.salary_slip.test_salary_slip import (
make_deduction_salary_component, make_deduction_salary_component,
make_earning_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 import frappe
from frappe.utils.make_random import get_random 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.doctype.project.test_project import make_project
from erpnext.projects.report.employee_hours_utilization_based_on_timesheet.employee_hours_utilization_based_on_timesheet import ( from erpnext.projects.report.employee_hours_utilization_based_on_timesheet.employee_hours_utilization_based_on_timesheet import (
execute, 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.tests.utils import FrappeTestCase
from frappe.utils import add_days, getdate 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 ( from erpnext.projects.doctype.timesheet.test_timesheet import (
make_salary_structure_for_timesheet, make_salary_structure_for_timesheet,
make_timesheet, make_timesheet,

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

@ -1,103 +1,103 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_import": 1, "allow_import": 1,
"allow_rename": 1, "allow_rename": 1,
"autoname": "field:branch", "autoname": "field:branch",
"beta": 0, "beta": 0,
"creation": "2013-01-10 16:34:13", "creation": "2013-01-10 16:34:13",
"custom": 0, "custom": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Setup", "document_type": "Setup",
"editable_grid": 0, "editable_grid": 0,
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "branch", "fieldname": "branch",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Branch", "label": "Branch",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "branch", "oldfieldname": "branch",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 1,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
} }
], ],
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 0,
"icon": "fa fa-code-fork", "icon": "fa fa-code-fork",
"idx": 1, "idx": 1,
"image_view": 0, "image_view": 0,
"in_create": 0, "in_create": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-07-25 05:24:26.534086", "modified": "2016-07-25 05:24:26.534086",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "Setup",
"name": "Branch", "name": "Branch",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "HR User", "role": "HR User",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 1, "share": 1,
"submit": 0, "submit": 0,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "HR Manager", "role": "HR Manager",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 1, "share": 1,
"submit": 0, "submit": 0,
"write": 1 "write": 1
} }
], ],
"quick_entry": 1, "quick_entry": 1,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"track_seen": 0 "track_seen": 0
} }

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

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

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

@ -1,7 +1,7 @@
frappe.treeview_settings["Department"] = { frappe.treeview_settings["Department"] = {
ignore_fields:["parent_department"], ignore_fields:["parent_department"],
get_tree_nodes: 'erpnext.hr.doctype.department.department.get_children', get_tree_nodes: 'employee.setup.doctype.department.department.get_children',
add_tree_node: 'erpnext.hr.doctype.department.department.add_node', add_tree_node: 'employee.setup.doctype.department.department.add_node',
filters: [ filters: [
{ {
fieldname: "company", fieldname: "company",

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

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

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

@ -58,7 +58,7 @@
"max_attachments": 0, "max_attachments": 0,
"modified": "2019-04-16 13:42:10.760449", "modified": "2019-04-16 13:42:10.760449",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "Setup",
"name": "Designation Skill", "name": "Designation Skill",
"name_case": "", "name_case": "",
"owner": "Administrator", "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.throw(__("Please enter Preferred Contact Email"));
} }
frappe.call({ frappe.call({
method: "erpnext.hr.doctype.employee.employee.create_user", method: "employee.setup.doctype.employee.employee.create_user",
args: { args: {
employee: frm.doc.name, employee: frm.doc.name,
email: frm.doc.prefered_email email: frm.doc.prefered_email

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

@ -777,7 +777,7 @@
"links": [], "links": [],
"modified": "2022-06-10 12:28:55.811983", "modified": "2022-06-10 12:28:55.811983",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "Setup",
"name": "Employee", "name": "Employee",
"name_case": "Title Case", "name_case": "Title Case",
"naming_rule": "By \"Naming Series\" field", "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 import _
from frappe.utils import add_days, add_months, comma_sep, getdate, today 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 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'] = { 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: [ filters: [
{ {
fieldname: "company", fieldname: "company",

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

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

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

@ -1,192 +1,192 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_import": 0, "allow_import": 0,
"allow_rename": 0, "allow_rename": 0,
"beta": 0, "beta": 0,
"creation": "2013-02-22 01:27:45", "creation": "2013-02-22 01:27:45",
"custom": 0, "custom": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "school_univ", "fieldname": "school_univ",
"fieldtype": "Small Text", "fieldtype": "Small Text",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "School/University", "label": "School/University",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "school_univ", "oldfieldname": "school_univ",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "qualification", "fieldname": "qualification",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Qualification", "label": "Qualification",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "qualification", "oldfieldname": "qualification",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"print_width": "100px", "print_width": "100px",
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0, "unique": 0,
"width": "100px" "width": "100px"
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "level", "fieldname": "level",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Level", "label": "Level",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "level", "oldfieldname": "level",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "Graduate\nPost Graduate\nUnder Graduate", "options": "Graduate\nPost Graduate\nUnder Graduate",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "year_of_passing", "fieldname": "year_of_passing",
"fieldtype": "Int", "fieldtype": "Int",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Year of Passing", "label": "Year of Passing",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "year_of_passing", "oldfieldname": "year_of_passing",
"oldfieldtype": "Int", "oldfieldtype": "Int",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "class_per", "fieldname": "class_per",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Class / Percentage", "label": "Class / Percentage",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "class_per", "oldfieldname": "class_per",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "maj_opt_subj", "fieldname": "maj_opt_subj",
"fieldtype": "Text", "fieldtype": "Text",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Major/Optional Subjects", "label": "Major/Optional Subjects",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "maj_opt_subj", "oldfieldname": "maj_opt_subj",
"oldfieldtype": "Text", "oldfieldtype": "Text",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
} }
], ],
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 0,
"idx": 1, "idx": 1,
"image_view": 0, "image_view": 0,
"in_create": 0, "in_create": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-07-11 03:27:59.995464", "modified": "2016-07-11 03:27:59.995464",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "Setup",
"name": "Employee Education", "name": "Employee Education",
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
"quick_entry": 0, "quick_entry": 0,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"track_seen": 0 "track_seen": 0
} }

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

@ -1,190 +1,190 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_import": 0, "allow_import": 0,
"allow_rename": 0, "allow_rename": 0,
"beta": 0, "beta": 0,
"creation": "2013-02-22 01:27:45", "creation": "2013-02-22 01:27:45",
"custom": 0, "custom": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "company_name", "fieldname": "company_name",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Company", "label": "Company",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company_name", "oldfieldname": "company_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "designation", "fieldname": "designation",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Designation", "label": "Designation",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "designation", "oldfieldname": "designation",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "salary", "fieldname": "salary",
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Salary", "label": "Salary",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "salary", "oldfieldname": "salary",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "address", "fieldname": "address",
"fieldtype": "Small Text", "fieldtype": "Small Text",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Address", "label": "Address",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "address", "oldfieldname": "address",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "contact", "fieldname": "contact",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Contact", "label": "Contact",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "contact", "oldfieldname": "contact",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "total_experience", "fieldname": "total_experience",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Total Experience", "label": "Total Experience",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "total_experience", "oldfieldname": "total_experience",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
} }
], ],
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 0,
"idx": 1, "idx": 1,
"image_view": 0, "image_view": 0,
"in_create": 0, "in_create": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-07-11 03:28:00.088980", "modified": "2016-07-11 03:28:00.088980",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "Setup",
"name": "Employee External Work History", "name": "Employee External Work History",
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
"quick_entry": 0, "quick_entry": 0,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"track_seen": 0 "track_seen": 0
} }

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

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

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

@ -5,7 +5,7 @@ import unittest
import frappe 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): class TestEmployeeGroup(unittest.TestCase):

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

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

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

@ -1,168 +1,168 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_import": 0, "allow_import": 0,
"allow_rename": 0, "allow_rename": 0,
"beta": 0, "beta": 0,
"creation": "2013-02-22 01:27:45", "creation": "2013-02-22 01:27:45",
"custom": 0, "custom": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "branch", "fieldname": "branch",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Branch", "label": "Branch",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "branch", "oldfieldname": "branch",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "Branch", "options": "Branch",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "department", "fieldname": "department",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Department", "label": "Department",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "department", "oldfieldname": "department",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "Department", "options": "Department",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "designation", "fieldname": "designation",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Designation", "label": "Designation",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "designation", "oldfieldname": "designation",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "Designation", "options": "Designation",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "from_date", "fieldname": "from_date",
"fieldtype": "Date", "fieldtype": "Date",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "From Date", "label": "From Date",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "from_date", "oldfieldname": "from_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "to_date", "fieldname": "to_date",
"fieldtype": "Date", "fieldtype": "Date",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "To Date", "label": "To Date",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "to_date", "oldfieldname": "to_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
} }
], ],
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 0,
"idx": 1, "idx": 1,
"image_view": 0, "image_view": 0,
"in_create": 0, "in_create": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-07-11 03:28:00.195130", "modified": "2016-07-11 03:28:00.195130",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "Setup",
"name": "Employee Internal Work History", "name": "Employee Internal Work History",
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
"quick_entry": 0, "quick_entry": 0,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_seen": 0 "track_seen": 0
} }

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

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

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

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

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

@ -10,7 +10,7 @@ frappe.views.calendar["Holiday List"] = {
"allDay": "allDay" "allDay": "allDay"
}, },
order_by: `from_date`, 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: [ filters: [
{ {
'fieldtype': 'Link', '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.contacts.doctype.contact.test_contact import create_contact
from frappe.tests.test_api import FrappeAPITestCase 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): class TestExotel(FrappeAPITestCase):

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

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