xlsx general ledger

This commit is contained in:
Florian du Garage Num 2024-11-23 19:07:38 +01:00
parent a6283dbc52
commit a36ff6bd5a
4 changed files with 15 additions and 9 deletions

View File

@ -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

View File

@ -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': """

View File

@ -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:

View File

@ -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])