Skip to content

Commit

Permalink
[IMP] add configuration to ignore warning avatax missing configuratio…
Browse files Browse the repository at this point in the history
…n on specific companies
  • Loading branch information
emiliesoutiras committed Jun 19, 2024
1 parent 7dc4cc5 commit c45856e
Show file tree
Hide file tree
Showing 7 changed files with 111 additions and 17 deletions.
1 change: 1 addition & 0 deletions account_avatax_oca/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"views/account_move_view.xml",
"views/account_tax_view.xml",
"views/account_fiscal_position_view.xml",
"views/res_config_settings_views.xml",
],
"demo": ["demo/avatax_demo.xml"],
"images": ["static/description/avatax_icon.png"],
Expand Down
1 change: 1 addition & 0 deletions account_avatax_oca/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
from . import account_tax
from . import res_company
from . import avatax_rest_api
from . import res_config
37 changes: 24 additions & 13 deletions account_avatax_oca/models/res_company.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,39 @@
import logging

from odoo import _, models
from odoo import _, fields, models

_LOGGER = logging.getLogger(__name__)


class Company(models.Model):
_inherit = "res.company"

allow_avatax_configuration = fields.Boolean(
string="Active Avatax for this company",
default=True,
readonly=False,
)

def get_avatax_config_company(self):
"""Returns the AvaTax configuration for the Company"""
if self:
self.ensure_one()
AvataxConfig = self.env["avalara.salestax"]
res = AvataxConfig.search(
[("company_id", "=", self.id), ("disable_tax_calculation", "=", False)]
)
if len(res) > 1:
_LOGGER.warning(
_("Company %s has too many Avatax configurations!"),
self.display_name,
)
if len(res) < 1:
_LOGGER.warning(
_("Company %s has no Avatax configuration."), self.display_name
if self.allow_avatax_configuration:
res = AvataxConfig.search(
[
("company_id", "=", self.id),
("disable_tax_calculation", "=", False),
]
)
return res and res[0]
if len(res) > 1:
_LOGGER.warning(
_("Company %s has too many Avatax configurations!"),
self.display_name,
)
if len(res) < 1:
_LOGGER.warning(
_("Company %s has no Avatax configuration."), self.display_name
)
return res and res[0]
return AvataxConfig
15 changes: 15 additions & 0 deletions account_avatax_oca/models/res_config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (c) 2024 Groupe Voltaire
# @author Emilie SOUTIRAS <emilie.soutiras@groupevoltaire.com>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

from odoo import fields, models


class ResConfigSettings(models.TransientModel):
_inherit = "res.config.settings"

allow_avatax_configuration = fields.Boolean(
string="Active Avatax for this company",
related="company_id.allow_avatax_configuration",
readonly=False,
)
11 changes: 7 additions & 4 deletions account_avatax_oca/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -274,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -300,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -820,7 +821,9 @@ <h2><a class="toc-backref" href="#toc-entry-19">Other credits</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-20">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
Expand Down
25 changes: 25 additions & 0 deletions account_avatax_oca/tests/test_account_tax.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,28 @@ def test_get_avatax_template(self):
def test_get_avatax_template_missing(self):
with self.assertRaises(exceptions.UserError):
self.Tax.with_company(self.company2).get_avalara_tax(0, "out_invoice")

def test_get_avatax_config_company_missing(self):
logger_name = "odoo.addons.account_avatax_oca.models.res_company"
with self.assertLogs(logger_name) as watcher:
res = self.company2.get_avatax_config_company()
expected_msg = "Company Company Avatax 2 has no Avatax configuration."
self.assertIn(expected_msg, watcher.output[0])
self.assertFalse(res.invoice_calculate_tax)
self.assertFalse(res.validation_on_save)

def test_get_avatax_config_company_no_config(self):
logger_name = "odoo.addons.account_avatax_oca.models.res_company"
self.company2.allow_avatax_configuration = False
res = self.company2.get_avatax_config_company()
self.assertFalse(res.invoice_calculate_tax)
self.assertFalse(res.validation_on_save)
# test no log
with self.assertRaises(AssertionError):
with self.assertLogs(logger_name, "DEBUG") as watcher:
self.company2.get_avatax_config_company()
expected_msg = "Company Company Avatax 2 has no Avatax configuration."
self.assertNotIn(
expected_msg,
watcher.output[0] if watcher.output else watcher.output,
)
38 changes: 38 additions & 0 deletions account_avatax_oca/views/res_config_settings_views.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8" ?>
<!--
~ # Copyright (c) 2024 Groupe Voltaire
~ # @author Emilie SOUTIRAS <emilie.soutiras@groupevoltaire.com>
~ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-->
<odoo>
<record id="res_config_settings_view_form" model="ir.ui.view">
<field name="name">res.config.settings.view.form.inherit.product</field>
<field name="model">res.config.settings</field>
<field name="inherit_id" ref="product.res_config_settings_view_form" />
<field name="arch" type="xml">
<xpath
expr="//div[@name='default_taxes_setting_container']"
position="inside"
>
<div class="col-12 col-lg-6 o_setting_box" id="avatax_configuration">
<div class="o_setting_left_pane">
<field name="allow_avatax_configuration" />
</div>
<div class="o_setting_right_pane">
<label for="allow_avatax_configuration" />
<span
class="fa fa-lg fa-building-o"
title="Values set here are company-specific."
aria-label="Values set here are company-specific."
groups="base.group_multi_company"
role="img"
/>
<div class="text-muted">
Avoid the selection of multiple VAT taxes.
</div>
</div>
</div>
</xpath>
</field>
</record>
</odoo>

0 comments on commit c45856e

Please sign in to comment.