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

fix: Sort account balances by account name

Browse Source
This commit is contained in:
Deepesh Garg 2021-06-10 18:09:49 +05:30
parent 8975c5241e
commit a5c3427293
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/account_balance/account_balance.py
View File

@ -58,11 +58,9 @@ def get_conditions(filters):
def get_data(filters): def get_data(filters):
data = [] data = []
conditions = get_conditions(filters) conditions = get_conditions(filters)
accounts = frappe.db.get_all("Account", fields=["name", "account_currency"], accounts = frappe.db.get_all("Account", fields=["name", "account_currency"],
filters=conditions) filters=conditions, order_by='name')
for d in accounts: for d in accounts:
balance = get_balance_on(d.name, date=filters.report_date) balance = get_balance_on(d.name, date=filters.report_date)

22
erpnext/accounts/report/account_balance/test_account_balance.py
View File

@ -23,7 +23,7 @@ class TestAccountBalance(unittest.TestCase):
expected_data = [ expected_data = [
{ {
"account": 'Sales - _TC2', "account": 'Direct Income - _TC2',
"currency": 'EUR', "currency": 'EUR',
"balance": -100.0, "balance": -100.0,
}, },
@ -32,21 +32,21 @@ class TestAccountBalance(unittest.TestCase):
"currency": 'EUR', "currency": 'EUR',
"balance": -100.0, "balance": -100.0,
}, },
{
"account": 'Service - _TC2',
"currency": 'EUR',
"balance": 0.0,
},
{
"account": 'Direct Income - _TC2',
"currency": 'EUR',
"balance": -100.0,
},
{ {
"account": 'Indirect Income - _TC2', "account": 'Indirect Income - _TC2',
"currency": 'EUR', "currency": 'EUR',
"balance": 0.0, "balance": 0.0,
}, },
{
"account": 'Sales - _TC2',
"currency": 'EUR',
"balance": -100.0,
},
{
"account": 'Service - _TC2',
"currency": 'EUR',
"balance": 0.0,
}
] ]
self.assertEqual(expected_data, report[1]) self.assertEqual(expected_data, report[1])