Skip to content

[REF] account: added a single entry point to allow changing the tax key and having more dimensiongs for tax lines #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benwillig wants to merge 1 commit into
base: 16.0
Choose a base branch
from
Open

[REF] account: added a single entry point to allow changing the tax key and having more dimensiongs for tax lines #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 31 additions & 24 deletions addons/account/models/account_move_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,18 +921,7 @@ def _get_computed_taxes(self):
def _compute_tax_key(self):
for line in self:
if line.tax_repartition_line_id:
line.tax_key = frozendict({
'tax_repartition_line_id': line.tax_repartition_line_id.id,
'group_tax_id': line.group_tax_id.id,
'account_id': line.account_id.id,
'currency_id': line.currency_id.id,
'analytic_distribution': line.analytic_distribution,
'tax_ids': [(6, 0, line.tax_ids.ids)],
'tax_tag_ids': [(6, 0, line.tax_tag_ids.ids)],
'partner_id': line.partner_id.id,
'move_id': line.move_id.id,
'display_type': line.display_type,
})
line.tax_key = frozendict(line._get_tax_key())
else:
line.tax_key = frozendict({'id': line.id})

Expand Down Expand Up @@ -966,18 +955,7 @@ def _compute_all_tax(self):
rate = line.amount_currency / line.balance if line.balance else 1
line.compute_all_tax_dirty = True
line.compute_all_tax = {
frozendict({
'tax_repartition_line_id': tax['tax_repartition_line_id'],
'group_tax_id': tax['group'] and tax['group'].id or False,
'account_id': tax['account_id'] or line.account_id.id,
'currency_id': line.currency_id.id,
'analytic_distribution': ((tax['analytic'] or not tax['use_in_tax_closing']) and line.move_id.state == 'draft') and line.analytic_distribution,
'tax_ids': [(6, 0, tax['tax_ids'])],
'tax_tag_ids': [(6, 0, tax['tag_ids'])],
'partner_id': line.move_id.partner_id.id or line.partner_id.id,
'move_id': line.move_id.id,
'display_type': line.display_type,
}): {
frozendict(line._get_compute_all_tax_key(tax)): {
'name': tax['name'] + (' ' + _('(Discount)') if line.display_type == 'epd' else ''),
'balance': tax['amount'] / rate,
'amount_currency': tax['amount'],
Expand All @@ -991,6 +969,35 @@ def _compute_all_tax(self):
'tax_tag_ids': [(6, 0, compute_all_currency['base_tags'])],
}

def _get_compute_all_tax_key(self, tax):
self.ensure_one()
values = self._get_tax_key()
values.update({
'tax_repartition_line_id': tax['tax_repartition_line_id'],
'group_tax_id': tax['group'] and tax['group'].id or False,
'account_id': tax['account_id'] or self.account_id.id,
'analytic_distribution': ((tax['analytic'] or not tax[
'use_in_tax_closing']) and self.move_id.state == 'draft') and self.analytic_distribution,
'tax_ids': [(6, 0, tax['tax_ids'])],
'tax_tag_ids': [(6, 0, tax['tag_ids'])],
})
return values

def _get_tax_key(self):
self.ensure_one()
return {
'tax_repartition_line_id': self.tax_repartition_line_id.id,
'group_tax_id': self.group_tax_id.id,
'account_id': self.account_id.id,
'currency_id': self.currency_id.id,
'analytic_distribution': self.analytic_distribution,
'tax_ids': [(6, 0, self.tax_ids.ids)],
'tax_tag_ids': [(6, 0, self.tax_tag_ids.ids)],
'partner_id': self.partner_id.id,
'move_id': self.move_id.id,
'display_type': self.display_type,
}

@api.depends('tax_ids', 'account_id', 'company_id')
def _compute_epd_key(self):
for line in self:
Expand Down