From a36ff6bd5a15c219bc73b1268f5c04067eb64451 Mon Sep 17 00:00:00 2001 From: Florian du Garage Num Date: Sat, 23 Nov 2024 19:07:38 +0100 Subject: [PATCH] xlsx general ledger --- gn_financial_report/README.md | 3 +++ gn_financial_report/__manifest__.py | 2 +- gn_financial_report/report/general_ledger.py | 17 ++++++++++------- gn_financial_report/report/trial_balance.py | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gn_financial_report/README.md b/gn_financial_report/README.md index 549ad46..835a757 100644 --- a/gn_financial_report/README.md +++ b/gn_financial_report/README.md @@ -26,6 +26,9 @@ It is based on modules: ## ChangeLog +- v16.0.0.0.11: + - correct bug in trial balance when no loss nor profit (ie pl == 0) + - allow general ledger xlxs export - v16.0.0.0.10: computing ok in trial balance - v16.0.0.0.9: no cumulative initial balance in general ledger - v16.0.0.0.8: computing for init and end balance for unaffected in general ledger diff --git a/gn_financial_report/__manifest__.py b/gn_financial_report/__manifest__.py index e10dc03..62feb97 100644 --- a/gn_financial_report/__manifest__.py +++ b/gn_financial_report/__manifest__.py @@ -1,6 +1,6 @@ { 'name': "Gn Financial Report", - 'version': '16.0.0.0.10', + 'version': '16.0.0.0.11', 'author': 'Garage Numérique', 'category': 'Accounting', 'description': """ diff --git a/gn_financial_report/report/general_ledger.py b/gn_financial_report/report/general_ledger.py index 91d19fe..1441f67 100644 --- a/gn_financial_report/report/general_ledger.py +++ b/gn_financial_report/report/general_ledger.py @@ -105,18 +105,21 @@ class GnGeneralLedgerReport(models.AbstractModel): unaffected_account = unaffected_profit_account[0] general_ledger[-1]['code'] = unaffected_account['code'] - accounts_data[unaffected_earnings_account]['code'] = unaffected_account['code'] general_ledger[-1]['name'] = unaffected_account['name'] - accounts_data[unaffected_earnings_account]['name'] = unaffected_account['name'] general_ledger[-1]['id'] = unaffected_id - accounts_data[unaffected_earnings_account]['id'] = unaffected_id - accounts_data[unaffected_earnings_account]['group_id'] = unaffected_account['group_id'].id for move_line in general_ledger[-1]['move_lines']: move_line['account_id'] = unaffected_id - - general_ledger = sorted(general_ledger, key=lambda k: k["code"]) - + + unaffected_accounts_data = { + 'code': unaffected_account['code'], + 'name': unaffected_account['name'], + 'id': unaffected_id, + 'group_id': unaffected_account['group_id'].id + } + del accounts_data[unaffected_earnings_account] + accounts_data[unaffected_id] = unaffected_accounts_data + # No cumul in initial balance for elem in general_ledger: if elem['init_bal']['balance'] < 0: diff --git a/gn_financial_report/report/trial_balance.py b/gn_financial_report/report/trial_balance.py index 310bd01..2f4ce1d 100644 --- a/gn_financial_report/report/trial_balance.py +++ b/gn_financial_report/report/trial_balance.py @@ -46,7 +46,7 @@ class TrialBalanceReport(models.AbstractModel): profit_id = profit_account[0].id if total_amount[unaffected_earnings_account]['ending_balance'] > 0: result_id = loss_id - elif total_amount[unaffected_earnings_account]['ending_balance'] < 0: + else: result_id = profit_id result_account_data = self._get_accounts_data([result_id])