odoo-addon-l10n-br-fiscal 17.0.1.0.0.13__py3-none-any.whl → 17.0.4.0.0.1__py3-none-any.whl

odoo/addons/l10n_br_fiscal/models/document_line_mixin.py

@@ -36,7 +36,6 @@ from ..constants.icms import (
     ICMS_BASE_TYPE,
     ICMS_BASE_TYPE_DEFAULT,
     ICMS_ORIGIN,
-    ICMS_ORIGIN_DEFAULT,
     ICMS_ST_BASE_TYPE,
     ICMS_ST_BASE_TYPE_DEFAULT,
 )
@@ -78,10 +77,6 @@ class FiscalDocumentLineMixin(models.AbstractModel):
     _inherit = "l10n_br_fiscal.document.line.mixin.methods"
     _description = "Document Fiscal Mixin"
 
-    @api.model
-    def _default_operation(self):
-        return False
-
     @api.model
     def _default_icmssn_range_id(self):
         company = self.env.company
@@ -139,16 +134,31 @@ class FiscalDocumentLineMixin(models.AbstractModel):
 
     partner_company_type = fields.Selection(related="partner_id.company_type")
 
-    uom_id = fields.Many2one(comodel_name="uom.uom", string="UOM")
+    uom_id = fields.Many2one(
+        comodel_name="uom.uom",
+        string="UOM",
+    )
 
     quantity = fields.Float(
         digits="Product Unit of Measure",
     )
 
-    fiscal_type = fields.Selection(selection=PRODUCT_FISCAL_TYPE)
+    fiscal_type = fields.Selection(
+        selection=PRODUCT_FISCAL_TYPE,
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
+    )
 
     ncm_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.ncm", index=True, string="NCM"
+        comodel_name="l10n_br_fiscal.ncm",
+        index=True,
+        string="NCM",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     nbm_id = fields.Many2one(
@@ -156,6 +166,10 @@ class FiscalDocumentLineMixin(models.AbstractModel):
         index=True,
         string="NBM",
         domain="[('ncm_ids', '=', ncm_id)]",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     cest_id = fields.Many2one(
@@ -163,17 +177,26 @@ class FiscalDocumentLineMixin(models.AbstractModel):
         index=True,
         string="CEST",
         domain="[('ncm_ids', '=', ncm_id)]",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     nbs_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.nbs", index=True, string="NBS"
+        comodel_name="l10n_br_fiscal.nbs",
+        index=True,
+        string="NBS",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     fiscal_operation_id = fields.Many2one(
         comodel_name="l10n_br_fiscal.operation",
         string="Operation",
         domain=lambda self: self._operation_domain(),
-        default=_default_operation,
     )
 
     fiscal_operation_type = fields.Selection(
@@ -263,11 +286,11 @@ class FiscalDocumentLineMixin(models.AbstractModel):
         compute="_compute_fiscal_amounts",
     )
 
-    amount_untaxed = fields.Monetary(
+    fiscal_amount_untaxed = fields.Monetary(
         compute="_compute_fiscal_amounts",
     )
 
-    amount_tax = fields.Monetary(
+    fiscal_amount_tax = fields.Monetary(
         compute="_compute_fiscal_amounts",
     )
 
@@ -275,7 +298,7 @@ class FiscalDocumentLineMixin(models.AbstractModel):
         compute="_compute_fiscal_amounts",
     )
 
-    amount_total = fields.Monetary(
+    fiscal_amount_total = fields.Monetary(
         compute="_compute_fiscal_amounts",
     )
 
@@ -301,7 +324,12 @@ class FiscalDocumentLineMixin(models.AbstractModel):
     amount_tax_withholding = fields.Monetary(string="Tax Withholding")
 
     fiscal_genre_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.product.genre", string="Fiscal Product Genre"
+        comodel_name="l10n_br_fiscal.product.genre",
+        string="Fiscal Product Genre",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     fiscal_genre_code = fields.Char(
@@ -312,10 +340,19 @@ class FiscalDocumentLineMixin(models.AbstractModel):
         comodel_name="l10n_br_fiscal.service.type",
         string="Service Type LC 166",
         domain="[('internal_type', '=', 'normal')]",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     city_taxation_code_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.city.taxation.code", string="City Taxation Code"
+        comodel_name="l10n_br_fiscal.city.taxation.code",
+        string="City Taxation Code",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     partner_order = fields.Char(string="Partner Order (xPed)", size=15)
@@ -336,6 +373,10 @@ class FiscalDocumentLineMixin(models.AbstractModel):
     issqn_fg_city_id = fields.Many2one(
         comodel_name="res.city",
         string="ISSQN City",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     # vDeducao
@@ -492,7 +533,12 @@ class FiscalDocumentLineMixin(models.AbstractModel):
     )
 
     icms_origin = fields.Selection(
-        selection=ICMS_ORIGIN, string="ICMS Origin", default=ICMS_ORIGIN_DEFAULT
+        selection=ICMS_ORIGIN,
+        string="ICMS Origin",
+        compute="_compute_product_fiscal_fields",
+        store=True,
+        readonly=False,
+        precompute=True,
     )
 
     # vBC - Valor da base de cálculo do ICMS
@@ -1625,14 +1671,12 @@ class FiscalDocumentLineMixin(models.AbstractModel):
         comodel_name="l10n_br_fiscal.comment",
         string="Comments",
         domain=[("object", "=", FISCAL_COMMENT_LINE)],
-        compute="_compute_fiscal_tax_ids",
+        compute="_compute_comment_ids",
         store=True,
         precompute=True,
         readonly=False,
     )
 
-    additional_data = fields.Text()
-
     manual_additional_data = fields.Text(
         help="Additional data manually entered by user"
     )

odoo/addons/l10n_br_fiscal/models/document_line_mixin_methods.py

@@ -4,11 +4,16 @@
 from copy import deepcopy
 
 from lxml import etree
+from lxml.builder import E
 
 from odoo import Command, api, models
 
-from ..constants.fiscal import CFOP_DESTINATION_EXPORT, FISCAL_IN
-from ..constants.icms import ICMS_BASE_TYPE_DEFAULT, ICMS_ST_BASE_TYPE_DEFAULT
+from ..constants.fiscal import CFOP_DESTINATION_EXPORT, FISCAL_IN, TAX_DOMAIN_ICMS
+from ..constants.icms import (
+    ICMS_BASE_TYPE_DEFAULT,
+    ICMS_ORIGIN_DEFAULT,
+    ICMS_ST_BASE_TYPE_DEFAULT,
+)
 
 FISCAL_TAX_ID_FIELDS = [
     "cofins_tax_id",
@@ -81,6 +86,23 @@ class FiscalDocumentLineMixinMethods(models.AbstractModel):
         Inject common fiscal fields into view placeholder elements.
         Used for invoice line, sale order line, purchase order line...
         """
+
+        # the list of computed fields we will add to the view when missing
+        missing_line_fields = set(
+            [
+                fname
+                for fname, _field in filter(
+                    lambda item: item[1].compute
+                    in (
+                        "_compute_tax_fields",
+                        "_compute_fiscal_tax_ids",
+                        "_compute_product_fiscal_fields",
+                    ),
+                    self.env["l10n_br_fiscal.document.line.mixin"]._fields.items(),
+                )
+            ]
+        )
+
         fiscal_view = self.env.ref(
             "l10n_br_fiscal.document_fiscal_line_mixin_form"
         ).sudo()
@@ -129,13 +151,19 @@ class FiscalDocumentLineMixinMethods(models.AbstractModel):
                         e.attrib["name"] for e in target_node if e.tag == "field"
                     ]
                     for fiscal_node in fiscal_nodes:
+                        if fiscal_node.attrib["name"] in missing_line_fields:
+                            missing_line_fields.remove(fiscal_node.attrib["name"])
                         if fiscal_node.attrib["name"] in existing_fields:
                             continue
                         field = deepcopy(fiscal_node)
                         if not field.attrib.get("optional"):
-                            field.attrib["invisible"] = "0"
                             field.attrib["optional"] = "hide"
                         target_node.append(field)
+                    for fname in missing_line_fields:
+                        if fname not in existing_fields:
+                            target_node.append(
+                                E.field(name=fname, string=fname, optional="hide")
+                            )
         return doc
 
     @api.model
@@ -171,11 +199,11 @@ class FiscalDocumentLineMixinMethods(models.AbstractModel):
             # Total value of products or services
             record.price_gross = round_curr.round(record.price_unit * record.quantity)
             record.amount_fiscal = record.price_gross - record.discount_value
-            record.amount_tax = record.amount_tax_not_included
+            record.fiscal_amount_tax = record.amount_tax_not_included
 
             add_to_amount = sum(record[a] for a in record._add_fields_to_amount())
             rm_to_amount = sum(record[r] for r in record._rm_fields_to_amount())
-            record.amount_untaxed = (
+            record.fiscal_amount_untaxed = (
                 record.price_gross
                 - record.discount_value
                 + add_to_amount
@@ -183,13 +211,17 @@ class FiscalDocumentLineMixinMethods(models.AbstractModel):
             )
 
             # Valor do documento (NF)
-            record.amount_total = record.amount_untaxed + record.amount_tax
+            record.fiscal_amount_total = (
+                record.fiscal_amount_untaxed + record.fiscal_amount_tax
+            )
 
             # Valor Liquido (TOTAL + IMPOSTOS - RETENÇÕES)
-            record.amount_taxed = record.amount_total - record.amount_tax_withholding
+            record.amount_taxed = (
+                record.fiscal_amount_total - record.amount_tax_withholding
+            )
 
             # Valor do documento (NF) - RETENÇÕES
-            record.amount_total = record.amount_taxed
+            record.fiscal_amount_total = record.amount_taxed
 
             # Valor financeiro
             if (
@@ -305,11 +337,16 @@ class FiscalDocumentLineMixinMethods(models.AbstractModel):
                 for tax in mapping_result["taxes"].values():
                     taxes |= tax
                 line.fiscal_tax_ids = taxes
-                line.comment_ids = line.fiscal_operation_line_id.comment_ids
-
             else:
                 line.fiscal_tax_ids = [Command.clear()]
 
+    @api.depends("fiscal_operation_line_id")
+    def _compute_comment_ids(self):
+        for line in self:
+            line.comment_ids = [
+                Command.set(line.fiscal_operation_line_id.comment_ids.ids)
+            ]
+
     @api.model
     def _build_null_mask_dict(self) -> dict:
         """
@@ -454,21 +491,6 @@ class FiscalDocumentLineMixinMethods(models.AbstractModel):
                 "cost_price": line.product_id.standard_price,
             }.get(line.fiscal_operation_id.default_price_unit, 0)
 
-    def __document_comment_vals(self):
-        self.ensure_one()
-        return {
-            "user": self.env.user,
-            "ctx": self._context,
-            "doc": self.document_id if hasattr(self, "document_id") else None,
-            "item": self,
-        }
-
-    def _document_comment(self):
-        for d in self:
-            d.additional_data = d.comment_ids.compute_message(
-                d.__document_comment_vals(), d.manual_additional_data
-            )
-
     def _get_fiscal_partner(self):
         """
         Meant to be overriden when the l10n_br_fiscal.document partner_id should not
@@ -480,48 +502,50 @@ class FiscalDocumentLineMixinMethods(models.AbstractModel):
         self.ensure_one()
         return self.partner_id
 
-    @api.onchange("product_id")
-    def _onchange_product_id_fiscal(self):
-        if not self.fiscal_operation_id:
+    @api.depends("product_id")
+    def _compute_product_fiscal_fields(self):
+        if self._context.get("skip_compute_product_fiscal_fields"):
             return
-        if self.product_id:
-            self.name = self.product_id.display_name
-            self.fiscal_type = self.product_id.fiscal_type
-            self.uom_id = self.product_id.uom_id
-            self.ncm_id = self.product_id.ncm_id
-            self.nbm_id = self.product_id.nbm_id
-            self.tax_icms_or_issqn = self.product_id.tax_icms_or_issqn
-            self.icms_origin = self.product_id.icms_origin
-            self.cest_id = self.product_id.cest_id
-            self.nbs_id = self.product_id.nbs_id
-            self.fiscal_genre_id = self.product_id.fiscal_genre_id
-            self.service_type_id = self.product_id.service_type_id
-            self.uot_id = self.product_id.uot_id or self.product_id.uom_id
-            if self.product_id.city_taxation_code_id:
-                company_city_id = self.company_id.city_id
-                city_id = self.product_id.city_taxation_code_id.filtered(
-                    lambda r: r.city_id == company_city_id
+        for line in self:
+            if not line.product_id:
+                # reset to default values:
+                line.fiscal_type = False
+                line.ncm_id = False
+                line.nbm_id = False
+                line.tax_icms_or_issqn = TAX_DOMAIN_ICMS
+                line.icms_origin = ICMS_ORIGIN_DEFAULT
+                line.cest_id = False
+                line.nbs_id = False
+                line.fiscal_genre_id = False
+                line.service_type_id = False
+                line.city_taxation_code_id = False
+                line.issqn_fg_city_id = False
+                continue
+
+            product = line.product_id
+            line.fiscal_type = product.fiscal_type
+            line.ncm_id = product.ncm_id
+            line.nbm_id = product.nbm_id
+            line.tax_icms_or_issqn = product.tax_icms_or_issqn
+            line.icms_origin = product.icms_origin
+            line.cest_id = product.cest_id
+            line.nbs_id = product.nbs_id
+            line.fiscal_genre_id = product.fiscal_genre_id
+            line.service_type_id = product.service_type_id
+            if product.city_taxation_code_ids and line.company_id:
+                city = product.city_taxation_code_ids.filtered(
+                    lambda r, current_line=line: r.city_id
+                    == current_line.company_id.city_id
                 )
-                if city_id:
-                    self.city_taxation_code_id = city_id
-                    self.issqn_fg_city_id = company_city_id
-        else:
-            self.name = False
-            self.fiscal_type = False
-            self.uom_id = False
-            self.ncm_id = False
-            self.nbm_id = False
-            self.tax_icms_or_issqn = False
-            self.icms_origin = False
-            self.cest_id = False
-            self.nbs_id = False
-            self.fiscal_genre_id = False
-            self.service_type_id = False
-            self.city_taxation_code_id = False
-            self.uot_id = False
-
-        self._compute_price_unit_fiscal()
-        self._onchange_fiscal_operation_id()
+                if city:
+                    line.city_taxation_code_id = city
+                    line.issqn_fg_city_id = line.company_id.city_id
+                else:
+                    line.city_taxation_code_id = False
+                    line.issqn_fg_city_id = False
+            else:
+                line.city_taxation_code_id = False
+                line.issqn_fg_city_id = False
 
     def _prepare_fields_issqn(self, tax_dict):
         self.ensure_one()
@@ -777,11 +801,18 @@ class FiscalDocumentLineMixinMethods(models.AbstractModel):
             )
             line.fiscal_tax_ids = fiscal_taxes + taxes
 
-    @api.depends("uom_id")
+    @api.depends("product_id", "uom_id")
     def _compute_uot_id(self):
         for line in self:
-            if not line.uot_id:
-                line.uot_id = line.uom_id
+            if line.uom_id:
+                line.uot_id = line.uom_id.id
+            elif line.product_id:
+                if line.product_id.uot_id:
+                    line.uot_id = line.product_id.uot_id.id
+                else:
+                    line.uot_id = line.product_id.uom_id.id
+            else:
+                line.uot_id = False
 
     @api.onchange("price_unit")
     def _onchange_price_unit_fiscal(self):

odoo/addons/l10n_br_fiscal/models/document_mixin.py

@@ -48,10 +48,6 @@ class FiscalDocumentMixin(models.AbstractModel):
     def _date_server_format(self):
         return fields.Datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT)
 
-    @api.model
-    def _default_operation(self):
-        return False
-
     @api.model
     def _operation_domain(self):
         domain = (
@@ -66,7 +62,6 @@ class FiscalDocumentMixin(models.AbstractModel):
         comodel_name="l10n_br_fiscal.operation",
         string="Operation",
         domain=lambda self: self._operation_domain(),
-        default=_default_operation,
     )
 
     operation_name = fields.Char(
@@ -105,14 +100,10 @@ class FiscalDocumentMixin(models.AbstractModel):
         store=True,
     )
 
-    fiscal_additional_data = fields.Text()
-
     manual_fiscal_additional_data = fields.Text(
         help="Fiscal Additional data manually entered by user",
     )
 
-    customer_additional_data = fields.Text()
-
     manual_customer_additional_data = fields.Text(
         help="Customer Additional data manually entered by user",
     )
@@ -135,7 +126,7 @@ class FiscalDocumentMixin(models.AbstractModel):
         help="Amount without discount.",
     )
 
-    amount_untaxed = fields.Monetary(
+    fiscal_amount_untaxed = fields.Monetary(
         compute="_compute_fiscal_amount",
         store=True,
     )
@@ -403,12 +394,12 @@ class FiscalDocumentMixin(models.AbstractModel):
         store=True,
     )
 
-    amount_tax = fields.Monetary(
+    fiscal_amount_tax = fields.Monetary(
         compute="_compute_fiscal_amount",
         store=True,
     )
 
-    amount_total = fields.Monetary(
+    fiscal_amount_total = fields.Monetary(
         compute="_compute_fiscal_amount",
         store=True,
     )