Skip to content
Snippets Groups Projects
Commit 02c75a70 authored by william's avatar william
Browse files

[FIX] account_analytic_default: defaults on invoice when coming from SO


opw-2226421

The analytic accounts are not set on creation of a new invoice from a
Sale Order, and when they are set, the default should not override the
values selected on the SO.

This commit reverts what was done in be7d1d75
which basically reverted what was done in 69bf61bb

closes odoo/odoo#48656

Signed-off-by: default avatarNicolas Martinelli (nim) <nim@odoo.com>
parent 35137cea
Branches
Tags
No related merge requests found
......@@ -68,11 +68,13 @@ class AccountAnalyticDefault(models.Model):
class AccountMoveLine(models.Model):
_inherit = 'account.move.line'
@api.onchange('product_id', 'account_id', 'partner_id', 'date_maturity')
def _onchange_analytic_account(self):
# Overload of fields defined in account
analytic_account_id = fields.Many2one(compute="_compute_analytic_account", store=True, readonly=False)
analytic_tag_ids = fields.Many2many(compute="_compute_analytic_account", store=True, readonly=False)
@api.depends('product_id', 'account_id', 'partner_id', 'date_maturity')
def _compute_analytic_account(self):
for record in self:
record.analytic_account_id = record.analytic_account_id or False
record.analytic_tag_ids = record.analytic_tag_ids or False
rec = self.env['account.analytic.default'].account_get(
product_id=record.product_id.id,
partner_id=record.partner_id.commercial_partner_id.id or record.move_id.partner_id.commercial_partner_id.id,
......@@ -81,6 +83,5 @@ class AccountMoveLine(models.Model):
date=record.date_maturity,
company_id=record.move_id.company_id.id
)
if rec:
record.analytic_account_id = rec.analytic_id
record.analytic_tag_ids = rec.analytic_tag_ids
record.analytic_account_id = record.analytic_account_id or rec.analytic_id
record.analytic_tag_ids = record.analytic_tag_ids or rec.analytic_tag_ids
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment