Skip to content
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.

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

[16.0][FIX] account_avatax_oca: skip exception raise on lines with not product in display_type #469

Open
wants to merge 1 commit into
base: 16.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions account_avatax_oca/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,11 @@ Contributors

* Atchuthan Ubendran

- Kencove (<https://kencove.com>)
- Don Kendall \<<[email protected]>\>
- Mohamed Alkobrosli \<<[email protected]>\>
- Wai-Lun Lin \<<[email protected]>\>

Other credits
~~~~~~~~~~~~~

Expand Down
1 change: 1 addition & 0 deletions account_avatax_oca/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from . import models
from . import wizard
from .hooks import pre_init_hook
from .hooks import post_load_hook
1 change: 1 addition & 0 deletions account_avatax_oca/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"website": "https://github.com/OCA/account-fiscal-rule",
"depends": ["sale_stock", "base_geolocalize"],
"pre_init_hook": "pre_init_hook",
"post_load": "post_load_hook",
"data": [
"security/avalara_salestax_security.xml",
"security/ir.model.access.csv",
Expand Down
87 changes: 87 additions & 0 deletions account_avatax_oca/hooks.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Copyright (C) 2022 Open Source Integrators
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from odoo import _, api
from odoo.tools import frozendict

from odoo.addons.account.models.account_move_line import AccountMoveLine


def pre_init_hook(cr):
# Preserve key data when moving from account_avatax to account_avatax_oca
Expand All @@ -13,3 +18,85 @@ def pre_init_hook(cr):
WHERE name in ('avatax_fiscal_position_us', 'account_avatax')
"""
)


def post_load_hook(): # noqa: C901
@api.depends(
"tax_ids",
"currency_id",
"partner_id",
"analytic_distribution",
"balance",
"partner_id",
"move_id.partner_id",
"price_unit",
"quantity",
)
def _compute_all_tax_new(self):
for line in self:
sign = line.move_id.direction_sign
if line.display_type == "tax":
line.compute_all_tax = {}
line.compute_all_tax_dirty = False
continue
if line.display_type == "product" and line.move_id.is_invoice(True):
amount_currency = sign * line.price_unit * (1 - line.discount / 100)
handle_price_include = True
quantity = line.quantity
else:
amount_currency = line.amount_currency
handle_price_include = False
quantity = 1
compute_all_currency = line.tax_ids.with_context(
current_aml=line.id
).compute_all(
amount_currency,
currency=line.currency_id,
quantity=quantity,
product=line.product_id,
partner=line.move_id.partner_id or line.partner_id,
is_refund=line.is_refund,
handle_price_include=handle_price_include,
include_caba_tags=line.move_id.always_tax_exigible,
fixed_multiplicator=sign,
)
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,
}
): {
"name": tax["name"]
+ (" " + _("(Discount)") if line.display_type == "epd" else ""),
"balance": tax["amount"] / rate,
"amount_currency": tax["amount"],
"tax_base_amount": tax["base"]
/ rate
* (-1 if line.tax_tag_invert else 1),
}
for tax in compute_all_currency["taxes"]
if tax["amount"]
}
if not line.tax_repartition_line_id:
line.compute_all_tax[frozendict({"id": line.id})] = {
"tax_tag_ids": [(6, 0, compute_all_currency["base_tags"])],
}

if not hasattr(AccountMoveLine, "_compute_all_tax_origin"):
AccountMoveLine._compute_all_tax_origin = AccountMoveLine._compute_all_tax
AccountMoveLine._compute_all_tax = _compute_all_tax_new
39 changes: 26 additions & 13 deletions account_avatax_oca/models/account_tax.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,26 +82,39 @@
fixed_multiplicator,
)
avatax_invoice = self.env.context.get("avatax_invoice")
current_aml = False
if "current_aml" in self.env.context:
current_aml = self.env["account.move.line"].browse(
self.env.context.get("current_aml")
)
if not (
current_aml.display_type == "product"
and current_aml.account_type != "asset_receivable"
):
avatax_invoice = False
if avatax_invoice:
# Find the Avatax amount in the invoice Lines
# Looks up the line for the current product, price_unit, and quantity
# Note that the price_unit used must consider discount
base = res["total_excluded"]
digits = 6
avatax_amount = None
for line in avatax_invoice.invoice_line_ids:
price_unit = line.currency_id._convert(
price_unit,
avatax_invoice.company_id.currency_id,
avatax_invoice.company_id,
avatax_invoice.date,
)
if (
line.product_id == product
and float_compare(line.quantity, quantity, digits) == 0
):
avatax_amount = copysign(line.avatax_amt_line, base)
break
if current_aml:
avatax_amount = copysign(current_aml.avatax_amt_line, base)

Check warning on line 103 in account_avatax_oca/models/account_tax.py

View check run for this annotation

Codecov / codecov/patch

account_avatax_oca/models/account_tax.py#L103

Added line #L103 was not covered by tests
else:
for line in avatax_invoice.invoice_line_ids:
price_unit = line.currency_id._convert(

Check warning on line 106 in account_avatax_oca/models/account_tax.py

View check run for this annotation

Codecov / codecov/patch

account_avatax_oca/models/account_tax.py#L106

Added line #L106 was not covered by tests
price_unit,
avatax_invoice.company_id.currency_id,
avatax_invoice.company_id,
avatax_invoice.date,
)
if (
line.product_id == product
and float_compare(line.quantity, quantity, digits) == 0
):
avatax_amount = copysign(line.avatax_amt_line, base)
break

Check warning on line 117 in account_avatax_oca/models/account_tax.py

View check run for this annotation

Codecov / codecov/patch

account_avatax_oca/models/account_tax.py#L116-L117

Added lines #L116 - L117 were not covered by tests
if avatax_amount is None:
avatax_amount = 0.0
raise exceptions.UserError(
Expand Down
5 changes: 5 additions & 0 deletions account_avatax_oca/readme/CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,8 @@
* Sodexis

* Atchuthan Ubendran

- Kencove (<https://kencove.com>)
- Don Kendall \<<[email protected]>\>
- Mohamed Alkobrosli \<<[email protected]>\>
- Wai-Lun Lin \<<[email protected]>\>
6 changes: 6 additions & 0 deletions account_avatax_oca/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,12 @@ <h2><a class="toc-backref" href="#toc-entry-18">Contributors</a></h2>
</ul>
</li>
</ul>
<ul class="simple">
<li>Kencove (&lt;<a class="reference external" href="https://kencove.com">https://kencove.com</a>&gt;)
- Don Kendall &lt;&lt;<a class="reference external" href="mailto:kendall&#64;donkendall.com">kendall&#64;donkendall.com</a>&gt;&gt;
- Mohamed Alkobrosli &lt;&lt;<a class="reference external" href="mailto:malkobrosly&#64;kencove.com">malkobrosly&#64;kencove.com</a>&gt;&gt;
- Wai-Lun Lin &lt;&lt;<a class="reference external" href="mailto:wlin&#64;kencove.com">wlin&#64;kencove.com</a>&gt;&gt;</li>
</ul>
</div>
<div class="section" id="other-credits">
<h2><a class="toc-backref" href="#toc-entry-19">Other credits</a></h2>
Expand Down
8 changes: 8 additions & 0 deletions account_avatax_oca/tests/test_account_tax.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ def setUpClass(cls):
cls.Tax = cls.env["account.tax"]
cls.company1 = cls.env.ref("base.main_company")
cls.company2 = cls.env["res.company"].create({"name": "Company Avatax 2"})
cls.journal = cls.env["account.journal"].create(
{
"name": "Test Sales Journal",
"type": "sale",
"code": "TSJ",
"company_id": cls.company2.id,
}
)

def test_get_avatax_tax_rate(self):
tax75 = self.Tax.get_avalara_tax(7.5, "out_invoice")
Expand Down
Loading