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

fix: dr / cr label for balance of the ledgers in the account tree

Browse Source
This commit is contained in:
Rohit Waghchaure 2019-07-12 15:44:58 +05:30
parent 838697261d
commit 8412f847d4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ frappe.treeview_settings["Account"] = {
}, },
onrender: function(node) { onrender: function(node) {
if(frappe.boot.user.can_read.indexOf("GL Entry") !== -1){ if(frappe.boot.user.can_read.indexOf("GL Entry") !== -1){
var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr"; var dr_or_cr = in_list(["Liability", "Income", "Equity"], node.data.root_type) ? "Cr" : "Dr";
if (node.data && node.data.balance!==undefined) { if (node.data && node.data.balance!==undefined) {
$('<span class="balance-area pull-right text-muted small">' $('<span class="balance-area pull-right text-muted small">'
+ (node.data.balance_in_account_currency ? + (node.data.balance_in_account_currency ?

3
erpnext/accounts/utils.py
View File

@ -734,6 +734,7 @@ def get_children(doctype, parent, company, is_root=False):
parent_fieldname = 'parent_' + doctype.lower().replace(' ', '_') parent_fieldname = 'parent_' + doctype.lower().replace(' ', '_')
fields = [ fields = [
'name as value', 'name as value',
'root_type',
'is_group as expandable' 'is_group as expandable'
] ]
filters = [['docstatus', '<', 2]] filters = [['docstatus', '<', 2]]
@ -741,7 +742,7 @@ def get_children(doctype, parent, company, is_root=False):
filters.append(['ifnull(`{0}`,"")'.format(parent_fieldname), '=', '' if is_root else parent]) filters.append(['ifnull(`{0}`,"")'.format(parent_fieldname), '=', '' if is_root else parent])
if is_root: if is_root:
fields += ['root_type', 'report_type', 'account_currency'] if doctype == 'Account' else [] fields += ['report_type', 'account_currency'] if doctype == 'Account' else []
filters.append(['company', '=', company]) filters.append(['company', '=', company])
else: else: