diff --git a/l10n_jp_summary_invoice/__manifest__.py b/l10n_jp_summary_invoice/__manifest__.py index d0191a7..3de962d 100644 --- a/l10n_jp_summary_invoice/__manifest__.py +++ b/l10n_jp_summary_invoice/__manifest__.py @@ -13,7 +13,6 @@ "data": [ "reports/report.xml", "reports/report_summary_invoice.xml", - "views/account_account_tag_views.xml", "views/account_billing_views.xml", ], "installable": True, diff --git a/l10n_jp_summary_invoice/models/__init__.py b/l10n_jp_summary_invoice/models/__init__.py index 8d22a58..c43433a 100644 --- a/l10n_jp_summary_invoice/models/__init__.py +++ b/l10n_jp_summary_invoice/models/__init__.py @@ -1,2 +1 @@ from . import account_billing -from . import account_account_tag diff --git a/l10n_jp_summary_invoice/models/account_account_tag.py b/l10n_jp_summary_invoice/models/account_account_tag.py deleted file mode 100644 index c63297b..0000000 --- a/l10n_jp_summary_invoice/models/account_account_tag.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2024 Quartile (https://www.quartile.co) -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). - -from odoo import models, fields, api - - -class AccountAccounttag(models.Model): - _inherit = 'account.account.tag' - - is_use_in_tax_adjustment = fields.Boolean(help="If enabled, this will be used as the tax grid in adjustment tax records.") diff --git a/l10n_jp_summary_invoice/models/account_billing.py b/l10n_jp_summary_invoice/models/account_billing.py index 15703e1..30e274b 100644 --- a/l10n_jp_summary_invoice/models/account_billing.py +++ b/l10n_jp_summary_invoice/models/account_billing.py @@ -18,7 +18,7 @@ def _get_tax_summary_from_invoices(self): tax_summary = {} for line in self.billing_line_ids: invoice = line.move_id - for tax_line in invoice.line_ids.filtered(lambda l: l.tax_line_id): + for tax_line in invoice.line_ids.filtered(lambda line: line.display_type == 'tax' or (line.display_type == 'rounding' and line.tax_repartition_line_id)): tax = tax_line.tax_line_id tax_summary[tax] = tax_summary.get(tax, 0) + tax_line.credit return tax_summary diff --git a/l10n_jp_summary_invoice/views/account_account_tag_views.xml b/l10n_jp_summary_invoice/views/account_account_tag_views.xml deleted file mode 100644 index 44fb439..0000000 --- a/l10n_jp_summary_invoice/views/account_account_tag_views.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - account.account.tag.form.inherit - account.account.tag - - - - - - - -