Merge pull request #7045 from saurabh6790/root_type_fix_and_other
[fix] Root type fix
diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js
index e63c797..4cf9a67 100644
--- a/erpnext/accounts/doctype/account/account_tree.js
+++ b/erpnext/accounts/doctype/account/account_tree.js
@@ -27,7 +27,8 @@
{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
- options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n')},
+ options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
+ depends_on: 'eval:doc.is_group && !doc.parent_account'},
{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
options: ['', 'Bank', 'Cash', 'Stock', 'Tax', 'Chargeable', 'Fixed Asset'].join('\n'),
description: __("Optional. This setting will be used to filter in various transactions.")
@@ -79,4 +80,4 @@
}
],
extend_toolbar: true
-}
\ No newline at end of file
+}
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 90c7f51..4a98470 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -212,3 +212,5 @@
]
get_site_info = 'erpnext.utilities.get_site_info'
+
+payment_gateway_enabled = "erpnext.accounts.utils.create_payment_gateway_and_account"