From 4cfff3bae40af37af1c120c1877311a74138b800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Mon, 5 Feb 2024 23:35:37 -0300 Subject: [PATCH] [MIG] l10n_br_purchase: Migration to 16.0 --- l10n_br_purchase/__manifest__.py | 2 +- l10n_br_purchase/models/purchase_order.py | 28 +++---------------- .../models/purchase_order_line.py | 4 +-- .../tests/test_l10n_br_purchase.py | 11 ++------ l10n_br_purchase/views/purchase_view.xml | 7 +++-- 5 files changed, 13 insertions(+), 39 deletions(-) diff --git a/l10n_br_purchase/__manifest__.py b/l10n_br_purchase/__manifest__.py index 2f52ccc395d4..19be1d2897db 100644 --- a/l10n_br_purchase/__manifest__.py +++ b/l10n_br_purchase/__manifest__.py @@ -8,7 +8,7 @@ "author": "Akretion, Odoo Community Association (OCA)", "maintainers": ["renatonlima", "rvalyi"], "website": "https://github.com/OCA/l10n-brazil", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "depends": ["purchase", "l10n_br_account"], "data": [ # Security diff --git a/l10n_br_purchase/models/purchase_order.py b/l10n_br_purchase/models/purchase_order.py index 2d549638f83b..f15e441b4d07 100644 --- a/l10n_br_purchase/models/purchase_order.py +++ b/l10n_br_purchase/models/purchase_order.py @@ -64,30 +64,10 @@ def _fiscal_operation_domain(self): ) @api.model - def fields_view_get( - self, view_id=None, view_type="form", toolbar=False, submenu=False - ): - order_view = super().fields_view_get(view_id, view_type, toolbar, submenu) - - if view_type == "form": - view = self.env["ir.ui.view"] - - sub_form_view = order_view["fields"]["order_line"]["views"]["form"]["arch"] - - sub_form_node = self.env["purchase.order.line"].inject_fiscal_fields( - sub_form_view - ) - - sub_arch, sub_fields = view.postprocess_and_fields( - sub_form_node, "purchase.order.line" - ) - - order_view["fields"]["order_line"]["views"]["form"] = { - "fields": sub_fields, - "arch": sub_arch, - } - - return order_view + def _get_view(self, view_id=None, view_type="form", **options): + arch, view = super()._get_view(view_id, view_type, **options) + arch = self.env["purchase.order.line"].inject_fiscal_fields(arch) + return arch, view @api.onchange("fiscal_operation_id") def _onchange_fiscal_operation_id(self): diff --git a/l10n_br_purchase/models/purchase_order_line.py b/l10n_br_purchase/models/purchase_order_line.py index 17f5a34ca38a..abae413d8f7e 100644 --- a/l10n_br_purchase/models/purchase_order_line.py +++ b/l10n_br_purchase/models/purchase_order_line.py @@ -114,9 +114,7 @@ def _compute_amount(self): def _onchange_quantity(self): """To call the method in the mixin to update the price and fiscal quantity.""" - result = super()._onchange_quantity() - self._onchange_commercial_quantity() - return result + return self._onchange_commercial_quantity() def _compute_tax_id(self): for line in self: diff --git a/l10n_br_purchase/tests/test_l10n_br_purchase.py b/l10n_br_purchase/tests/test_l10n_br_purchase.py index ffa9f08e1ba9..8687a98e57ab 100644 --- a/l10n_br_purchase/tests/test_l10n_br_purchase.py +++ b/l10n_br_purchase/tests/test_l10n_br_purchase.py @@ -2,8 +2,6 @@ # Magno Costa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from lxml import etree - from odoo.tests import Form, TransactionCase from odoo.addons.l10n_br_fiscal.constants.fiscal import ( @@ -276,7 +274,6 @@ def _invoice_purchase_order(self, order): ) for line in invoice.invoice_line_ids: - line._onchange_price_subtotal() self.assertTrue( line.fiscal_operation_line_id, "Error to included Operation " "Line from Purchase Order Line.", @@ -451,12 +448,10 @@ def test_form_purchase(self): purchase_form.save() - def test_fields_view_get(self): - """Test Purchase Order fields_view_get.""" - view_arch = etree.fromstring(self.po_products.fields_view_get()["arch"]) - + def test_get_view(self): + arch, models = self.po_products._get_view() self.assertTrue( - view_arch.findall(".//field[@name='fiscal_operation_id']"), + arch.findall(".//field[@name='fiscal_operation_id']"), "Error to included Operation " "Line from Purchase Order Line.", ) diff --git a/l10n_br_purchase/views/purchase_view.xml b/l10n_br_purchase/views/purchase_view.xml index a1a5e85df0a9..ec586e9edf37 100644 --- a/l10n_br_purchase/views/purchase_view.xml +++ b/l10n_br_purchase/views/purchase_view.xml @@ -70,6 +70,7 @@ + - + - +