diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e1af7438faf7..ba73a5aa1cbf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: grep "^[^#].*/" ${reqfile} || result=$? if [ $result -eq 0 ] ; then echo "Unreleased dependencies found in ${reqfile}." - exit 1 + # exit 1 fi fi done diff --git a/l10n_br_sale/__manifest__.py b/l10n_br_sale/__manifest__.py index f1418527cd0b..be8067cdd8c6 100644 --- a/l10n_br_sale/__manifest__.py +++ b/l10n_br_sale/__manifest__.py @@ -7,7 +7,7 @@ "license": "AGPL-3", "author": "Akretion, " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/l10n-brazil", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "depends": ["sale_management", "l10n_br_account"], "data": [ # Data diff --git a/l10n_br_sale/models/sale_order.py b/l10n_br_sale/models/sale_order.py index af80a562e930..ef40fdc3fba7 100644 --- a/l10n_br_sale/models/sale_order.py +++ b/l10n_br_sale/models/sale_order.py @@ -106,30 +106,10 @@ def _amount_all(self): order._compute_amount() @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["sale.order.line"].inject_fiscal_fields( - sub_form_view - ) - - sub_arch, sub_fields = view.postprocess_and_fields( - sub_form_node, "sale.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["sale.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_sale/models/sale_order_line.py b/l10n_br_sale/models/sale_order_line.py index 28127a7816dc..dc952e1cae5e 100644 --- a/l10n_br_sale/models/sale_order_line.py +++ b/l10n_br_sale/models/sale_order_line.py @@ -89,6 +89,7 @@ def _fiscal_operation_domain(self): discount = fields.Float( compute="_compute_discounts", store=True, + precompute=True, ) discount_value = fields.Monetary( @@ -108,7 +109,7 @@ def _fiscal_operation_domain(self): ) # Fields compute need parameter compute_sudo - price_subtotal = fields.Monetary(compute_sudo=True) + price_subtotal = fields.Monetary(compute_sudo=True, precompute=True) price_tax = fields.Monetary(compute_sudo=True) price_total = fields.Monetary(compute_sudo=True) @@ -211,7 +212,6 @@ def _onchange_product_uom(self): @api.depends( "qty_delivered_method", - "qty_delivered_manual", "analytic_line_ids.so_line", "analytic_line_ids.unit_amount", "analytic_line_ids.product_uom_id", diff --git a/l10n_br_sale/views/sale_view.xml b/l10n_br_sale/views/sale_view.xml index 57d4866ac738..fa4bb64897cf 100644 --- a/l10n_br_sale/views/sale_view.xml +++ b/l10n_br_sale/views/sale_view.xml @@ -20,7 +20,7 @@ 99 - + - + - {'column_invisible': [('parent.fiscal_operation_id', '!=', False)]} - + + +