diff --git a/erpnext/accounts/doctype/salary_component_account/__init__.py b/erpnext/accounts/doctype/salary_component_account/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/accounts/doctype/salary_component_account/salary_component_account.json b/erpnext/accounts/doctype/salary_component_account/salary_component_account.json deleted file mode 100644 index f1ed8efa319..00000000000 --- a/erpnext/accounts/doctype/salary_component_account/salary_component_account.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "actions": [], - "creation": "2016-07-27 17:24:24.956896", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "company", - "account" - ], - "fields": [ - { - "fieldname": "company", - "fieldtype": "Link", - "in_list_view": 1, - "label": "Company", - "options": "Company" - }, - { - "description": "Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.", - "fieldname": "account", - "fieldtype": "Link", - "in_list_view": 1, - "label": "Account", - "options": "Account" - } - ], - "istable": 1, - "links": [], - "modified": "2020-10-18 17:57:57.110257", - "modified_by": "Administrator", - "module": "Accounts", - "name": "Salary Component Account", - "owner": "Administrator", - "permissions": [], - "sort_field": "modified", - "sort_order": "DESC" -} \ No newline at end of file diff --git a/erpnext/accounts/doctype/salary_component_account/salary_component_account.py b/erpnext/accounts/doctype/salary_component_account/salary_component_account.py deleted file mode 100644 index b70179aa912..00000000000 --- a/erpnext/accounts/doctype/salary_component_account/salary_component_account.py +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - - -from frappe.model.document import Document - - -class SalaryComponentAccount(Document): - pass diff --git a/erpnext/patches/v14_0/delete_hr_payroll_doctypes.py b/erpnext/patches/v14_0/delete_hr_payroll_doctypes.py index e475e165787..6431bba0c63 100644 --- a/erpnext/patches/v14_0/delete_hr_payroll_doctypes.py +++ b/erpnext/patches/v14_0/delete_hr_payroll_doctypes.py @@ -45,7 +45,8 @@ def execute(): for doctype in doctypes: frappe.delete_doc("DocType", doctype, ignore_missing=True) - frappe.delete_doc("Loan Management", "Salary Slip Loan", ignore_missing=True) + frappe.delete_doc("DocType", "Salary Slip Loan", ignore_missing=True) + frappe.delete_doc("DocType", "Salary Component Account", ignore_missing=True) notifications = frappe.get_all( "Notification", {"module": ("in", ["HR", "Payroll"]), "is_standard": 1}, pluck="name"