Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14050 from Zlash65/fix-dept

Browse Source 
[Minor] Account_type dropdown was hard coded in tree's quick entry
This commit is contained in:
rohitwaghchaure 2018-05-15 17:39:37 +05:30 committed by GitHub
commit ec54cb1810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/account/account_tree.js
View File

@ -32,9 +32,7 @@ frappe.treeview_settings["Account"] = {
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'}, depends_on: 'eval:doc.is_group && !doc.parent_account'},
{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'), {fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
options: ['', 'Accumulated Depreciation', 'Bank', 'Cash', 'Chargeable', 'Cost of Goods Sold', 'Depreciation', options: frappe.get_meta("Account").fields.filter(d => d.fieldname=='account_type')[0].options,
'Equity', 'Expense Account', 'Expenses Included In Valuation', 'Fixed Asset', 'Income Account', 'Payable', 'Receivable',
'Round Off', 'Stock', 'Stock Adjustment', 'Stock Received But Not Billed', 'Tax', 'Temporary'].join('\n'),
description: __("Optional. This setting will be used to filter in various transactions.") description: __("Optional. This setting will be used to filter in various transactions.")
}, },
{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'), {fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),