Browse Source
Merge pull request #544 from linkitspa/11.0-fix-account_financial_report-trial_balance
[11.0][FIX] account_financial_report: Trial Balance - Hierarchy On = Computed Accounts
pull/552/head
Pedro M. Baeza
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
account_financial_report/report/trial_balance.py
-
account_financial_report/tests/test_trial_balance.py
|
|
@ -572,7 +572,7 @@ WHERE newline.account_group_id = report_trial_balance_account.parent_id |
|
|
groups = self.account_ids.filtered( |
|
|
groups = self.account_ids.filtered( |
|
|
lambda a: a.account_group_id is not False) |
|
|
lambda a: a.account_group_id is not False) |
|
|
for group in groups: |
|
|
for group in groups: |
|
|
if self.hierarchy_on == 'compute': |
|
|
|
|
|
|
|
|
if self.hierarchy_on == 'computed': |
|
|
group.compute_account_ids = \ |
|
|
group.compute_account_ids = \ |
|
|
group.account_group_id.compute_account_ids |
|
|
group.account_group_id.compute_account_ids |
|
|
else: |
|
|
else: |
|
|
|
|
|
@ -326,7 +326,7 @@ class TestTrialBalanceReport(common.TransactionCase): |
|
|
self.assertEqual(lines['group2'].debit, 2000) |
|
|
self.assertEqual(lines['group2'].debit, 2000) |
|
|
self.assertEqual(lines['group2'].credit, 0) |
|
|
self.assertEqual(lines['group2'].credit, 0) |
|
|
self.assertEqual(lines['group2'].final_balance, 2000) |
|
|
self.assertEqual(lines['group2'].final_balance, 2000) |
|
|
self.assertEqual(len(lines['group2'].compute_account_ids), 2) |
|
|
|
|
|
|
|
|
self.assertEqual(len(lines['group2'].compute_account_ids), 9) |
|
|
|
|
|
|
|
|
def test_02_account_balance_hierarchy(self): |
|
|
def test_02_account_balance_hierarchy(self): |
|
|
# Generate the general ledger line |
|
|
# Generate the general ledger line |
|
|
|
