fix: Remove HR & Payroll Settings from Company master
- moved setup to HRMS app
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index 0de5b2d..298414e 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -210,12 +210,10 @@
["default_payable_account", {"account_type": "Payable"}],
["default_expense_account", {"root_type": "Expense"}],
["default_income_account", {"root_type": "Income"}],
- ["default_payroll_payable_account", {"root_type": "Liability"}],
["round_off_account", {"root_type": "Expense"}],
["write_off_account", {"root_type": "Expense"}],
["default_deferred_expense_account", {}],
["default_deferred_revenue_account", {}],
- ["default_expense_claim_payable_account", {}],
["default_discount_account", {}],
["discount_allowed_account", {"root_type": "Expense"}],
["discount_received_account", {"root_type": "Income"}],
@@ -229,7 +227,6 @@
["cost_center", {}],
["round_off_cost_center", {}],
["depreciation_cost_center", {}],
- ["default_employee_advance_account", {"root_type": "Asset"}],
["expenses_included_in_asset_valuation", {"account_type": "Expenses Included In Asset Valuation"}],
["capital_work_in_progress_account", {"account_type": "Capital Work in Progress"}],
["asset_received_but_not_billed", {"account_type": "Asset Received But Not Billed"}],
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index cc62a2a..f34ec56 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -15,6 +15,7 @@
"default_currency",
"country",
"is_group",
+ "default_holiday_list",
"cb0",
"default_letter_head",
"tax_id",
@@ -48,12 +49,6 @@
"default_warehouse_for_sales_return",
"credit_limit",
"transactions_annual_history",
- "hr_settings_section",
- "default_holiday_list",
- "default_expense_claim_payable_account",
- "column_break_10",
- "default_employee_advance_account",
- "default_payroll_payable_account",
"default_settings",
"default_bank_account",
"default_cash_account",
@@ -239,10 +234,7 @@
"label": "Default Warehouse for Sales Return",
"options": "Warehouse"
},
- {
- "fieldname": "column_break_10",
- "fieldtype": "Column Break"
- },
+
{
"fieldname": "country",
"fieldtype": "Link",
@@ -375,13 +367,6 @@
"options": "Account"
},
{
- "fieldname": "default_employee_advance_account",
- "fieldtype": "Link",
- "label": "Default Employee Advance Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
"depends_on": "eval:!doc.__islocal",
"fieldname": "default_expense_account",
"fieldtype": "Link",
@@ -419,24 +404,6 @@
},
{
"depends_on": "eval:!doc.__islocal",
- "fieldname": "default_payroll_payable_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Payroll Payable Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_expense_claim_payable_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Expense Claim Payable Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "depends_on": "eval:!doc.__islocal",
"fieldname": "cost_center",
"fieldtype": "Link",
"ignore_user_permissions": 1,
@@ -702,11 +669,6 @@
"options": "Account"
},
{
- "fieldname": "hr_settings_section",
- "fieldtype": "Section Break",
- "label": "HR & Payroll Settings"
- },
- {
"fieldname": "column_break_26",
"fieldtype": "Column Break"
},
@@ -747,7 +709,7 @@
"image_field": "company_logo",
"is_tree": 1,
"links": [],
- "modified": "2022-04-27 10:33:16.826067",
+ "modified": "2022-06-30 18:03:18.701314",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 9ffd6df..4ba66bd 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -95,7 +95,6 @@
["Stock Received But Not Billed Account", "stock_received_but_not_billed"],
["Stock Adjustment Account", "stock_adjustment_account"],
["Expense Included In Valuation Account", "expenses_included_in_valuation"],
- ["Default Payroll Payable Account", "default_payroll_payable_account"],
]
for account in accounts:
@@ -325,20 +324,6 @@
if not self.default_payable_account:
self.db_set("default_payable_account", self.default_payable_account)
- if not self.default_payroll_payable_account:
- payroll_payable_account = frappe.db.get_value(
- "Account", {"account_name": _("Payroll Payable"), "company": self.name, "is_group": 0}
- )
-
- self.db_set("default_payroll_payable_account", payroll_payable_account)
-
- if not self.default_employee_advance_account:
- employe_advance_account = frappe.db.get_value(
- "Account", {"account_name": _("Employee Advances"), "company": self.name, "is_group": 0}
- )
-
- self.db_set("default_employee_advance_account", employe_advance_account)
-
if not self.write_off_account:
write_off_acct = frappe.db.get_value(
"Account", {"account_name": _("Write Off"), "company": self.name, "is_group": 0}
diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index 2d29886..2edbaec 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -461,6 +461,7 @@
"department_name": _("All Departments"),
"is_group": 1,
"parent_department": "",
+ "company": args.company_name,
},
{
"doctype": "Department",