Merge pull request #4230 from nabinhait/fix26
minor fix
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index c3e4c39..8544b17 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -147,6 +147,8 @@
self.validate_warehouse(old_warehouse)
if self.warehouse:
self.validate_warehouse(self.warehouse)
+ elif self.warehouse:
+ self.warehouse = None
def validate_warehouse(self, warehouse):
if frappe.db.get_value("Stock Ledger Entry", {"warehouse": warehouse}):
diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js
index abd7612..b172ae0 100644
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.js
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js
@@ -209,13 +209,12 @@
{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:'account_type', label:__('Account Type'),
- options: ['', 'Bank', 'Cash', 'Warehouse', 'Receivable', 'Payable',
- 'Equity', 'Cost of Goods Sold', 'Fixed Asset', 'Expense Account',
- 'Income Account', 'Tax', 'Chargeable', 'Temporary'].join('\n'),
+ options: ['', 'Bank', 'Cash', 'Warehouse', 'Tax', 'Chargeable'].join('\n'),
description: __("Optional. This setting will be used to filter in various transactions.") },
{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate')},
{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse"},
- {fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency"}
+ {fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
+ description: __("Optional. Sets company's default currency, if not specified.")}
]
})