tocmo0nlord/Odoo-18.0-20251222
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account_financial_report: fix ValueError

Browse Source 
``analytic_distribution`` is a JSON field where keys are 'account.id' or 'account.id,account.id'
Eg: https://github.com/odoo/odoo/blob/8479b4e/addons/sale/models/account_move_line.py#L158
Previous implementation tried to convert to ``int`` the ``analytic_distribution`` dict keys, leading to a ``ValueError``.
This commit fixes this bug.
This commit is contained in:
SilvioC2C
2024-08-29 14:41:21 +02:00
committed by chaule97
parent e6ea9c90e2
commit f3a8695c0c
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
account_financial_report/models/account_move_line.py
View File

@@ -3,6 +3,7 @@
from collections import defaultdict from collections import defaultdict
from odoo import api, fields, models from odoo import api, fields, models
from odoo.fields import Command
class AccountMoveLine(models.Model): class AccountMoveLine(models.Model):
@@ -15,25 +16,25 @@ class AccountMoveLine(models.Model):
@api.depends("analytic_distribution") @api.depends("analytic_distribution")
def _compute_analytic_account_ids(self): def _compute_analytic_account_ids(self):
# Prefetch all involved analytic accounts # Prefetch all involved analytic accounts
with_distribution = self.filtered("analytic_distribution") batch_by_analytic_account = defaultdict(lambda: self.env["account.move.line"])
batch_by_analytic_account = defaultdict(list) for record in self.filtered("analytic_distribution"):
for record in with_distribution: # NB: ``analytic_distribution`` is a JSON field where keys can be either
for account_id in map(int, record.analytic_distribution): # 'account.id' or 'account.id,account.id'
batch_by_analytic_account[account_id].append(record.id) # Eg: https://github.com/odoo/odoo/blob/8479b4e/addons/sale/models/account_move_line.py#L158
for key in record.analytic_distribution:
for account_id in map(int, key.split(",")):
batch_by_analytic_account[account_id] += record
existing_account_ids = set( existing_account_ids = set(
self.env["account.analytic.account"] self.env["account.analytic.account"]
.browse(map(int, batch_by_analytic_account)) .browse(batch_by_analytic_account)
.exists() .exists()
.ids .ids
) )
# Store them # Store them
self.analytic_account_ids = False self.analytic_account_ids = [Command.clear()]
for account_id, record_ids in batch_by_analytic_account.items(): for account_id, records in batch_by_analytic_account.items():
if account_id not in existing_account_ids: if account_id in existing_account_ids:
continue records.analytic_account_ids = [Command.link(account_id)]
self.browse(record_ids).analytic_account_ids = [
fields.Command.link(account_id)
]
def init(self): def init(self):
""" """