From fd046dde41d0fdbb1f215c8cb33794bb76ca1f72 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Tue, 18 Jul 2023 18:44:39 -0300
Subject: [PATCH 01/25] [ADD] document import wizard base

---
 l10n_br_fiscal/__manifest__.py                |  1 +
 l10n_br_fiscal/security/ir.model.access.csv   |  1 +
 l10n_br_fiscal/wizards/__init__.py            |  1 +
 l10n_br_fiscal/wizards/base_wizard_mixin.py   |  5 +--
 .../wizards/document_import_wizard_mixin.py   | 28 +++++++++++++
 .../wizards/document_import_wizard_mixin.xml  | 42 +++++++++++++++++++
 6 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 l10n_br_fiscal/wizards/document_import_wizard_mixin.py
 create mode 100644 l10n_br_fiscal/wizards/document_import_wizard_mixin.xml

diff --git a/l10n_br_fiscal/__manifest__.py b/l10n_br_fiscal/__manifest__.py
index a333d88786f6..ad11aef4e147 100644
--- a/l10n_br_fiscal/__manifest__.py
+++ b/l10n_br_fiscal/__manifest__.py
@@ -93,6 +93,7 @@
         "wizards/document_correction_wizard.xml",
         "wizards/document_status_wizard.xml",
         "wizards/invalidate_number_wizard.xml",
+        "wizards/document_import_wizard_mixin.xml",
         # Actions
         "views/l10n_br_fiscal_action.xml",
         # Menus
diff --git a/l10n_br_fiscal/security/ir.model.access.csv b/l10n_br_fiscal/security/ir.model.access.csv
index 43a893a1a1af..fe489986eace 100644
--- a/l10n_br_fiscal/security/ir.model.access.csv
+++ b/l10n_br_fiscal/security/ir.model.access.csv
@@ -100,3 +100,4 @@
 "l10n_br_fiscal_document_correction_wizard_user",l10n_br_fiscal_document_correction_wizard,model_l10n_br_fiscal_document_correction_wizard,base.group_user,1,1,1,1
 "l10n_br_fiscal_document_status_wizard_user",l10n_br_fiscal_document_status_wizard,model_l10n_br_fiscal_document_status_wizard,base.group_user,1,1,1,1
 "l10n_br_fiscal_invalidate_number_wizard_user",l10n_br_fiscal_invalidate_number_wizard,model_l10n_br_fiscal_invalidate_number_wizard,base.group_user,1,1,1,1
+"l10n_br_fiscal_document_import_wizard_mixin_user",l10n_br_fiscal_document_import_wizard_mixin_user,model_l10n_br_fiscal_document_import_wizard_mixin,base.group_user,1,1,1,1
diff --git a/l10n_br_fiscal/wizards/__init__.py b/l10n_br_fiscal/wizards/__init__.py
index be1cc09aed00..2d2857137755 100644
--- a/l10n_br_fiscal/wizards/__init__.py
+++ b/l10n_br_fiscal/wizards/__init__.py
@@ -5,3 +5,4 @@
 from . import document_correction_wizard
 from . import document_status_wizard
 from . import invalidate_number_wizard
+from . import document_import_wizard_mixin
diff --git a/l10n_br_fiscal/wizards/base_wizard_mixin.py b/l10n_br_fiscal/wizards/base_wizard_mixin.py
index 29af068326a4..735e1c508d82 100644
--- a/l10n_br_fiscal/wizards/base_wizard_mixin.py
+++ b/l10n_br_fiscal/wizards/base_wizard_mixin.py
@@ -70,11 +70,10 @@ def _document_fields(self):
     @api.model
     def default_get(self, fields_list):
         default_values = super().default_get(fields_list)
-        active_model = self.env.context["active_model"]
+        active_model = self._context.get("active_model")
 
         if self._prepare_key_fields().get(active_model):
-
-            active_id = self.env.context["active_id"]
+            active_id = self._context["active_id"]
             active_vals = (
                 self.env[active_model]
                 .browse(active_id)
diff --git a/l10n_br_fiscal/wizards/document_import_wizard_mixin.py b/l10n_br_fiscal/wizards/document_import_wizard_mixin.py
new file mode 100644
index 000000000000..e05220551bc7
--- /dev/null
+++ b/l10n_br_fiscal/wizards/document_import_wizard_mixin.py
@@ -0,0 +1,28 @@
+# Copyright (C) 2023  Felipe Zago Rodrigues - Kmee
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from odoo import fields, models
+
+from odoo.addons.l10n_br_fiscal.constants.fiscal import FISCAL_IN_OUT_ALL
+
+
+class DocumentImportWizardMixin(models.TransientModel):
+
+    _name = "l10n_br_fiscal.document.import.wizard.mixin"
+    _inherit = "l10n_br_fiscal.base.wizard.mixin"
+
+    company_id = fields.Many2one(
+        comodel_name="res.company",
+        string="Company",
+        default=lambda self: self.env.user.company_id,
+    )
+
+    importing_type = fields.Selection(
+        selection=[("xml_file", "XML File")], string="Importing Type", required=True
+    )
+
+    xml = fields.Binary(string="XML to Import")
+
+    fiscal_operation_type = fields.Selection(
+        string="Fiscal Operation Type", selection=FISCAL_IN_OUT_ALL
+    )
diff --git a/l10n_br_fiscal/wizards/document_import_wizard_mixin.xml b/l10n_br_fiscal/wizards/document_import_wizard_mixin.xml
new file mode 100644
index 000000000000..d8af9e648a29
--- /dev/null
+++ b/l10n_br_fiscal/wizards/document_import_wizard_mixin.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2023 KMEE
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record id="l10n_br_fiscal_document_import_wizard_mixin_form" model="ir.ui.view">
+        <field name="name">l10n_br_fiscal.document.import.wizard.mixin.form</field>
+        <field name="model">l10n_br_fiscal.document.import.wizard.mixin</field>
+        <field name="arch" type="xml">
+            <form string="Import Document">
+                <group>
+                    <field name="company_id" />
+                    <field name="importing_type" />
+                    <field
+                        name="xml"
+                        attrs="{
+                            'invisible': [('importing_type', '!=', 'xml_file')],
+                            'required': [('importing_type', '=', 'xml_file')]
+                        }"
+                    />
+                </group>
+                <separator
+                    string="Preview Data"
+                    attrs="{'invisible': [('xml', '=', False)]}"
+                />
+                <group id="document_info" attrs="{'invisible': [('xml', '=', False)]}">
+                    <group>
+                        <field name="document_key" readonly="1" />
+                        <field name="document_number" readonly="1" />
+                        <field name="document_serie" readonly="1" />
+                    </group>
+
+                    <group>
+                        <field name="partner_id" readonly="1" />
+                    </group>
+                </group>
+                <footer />
+            </form>
+        </field>
+    </record>
+
+</odoo>

From 0182c8467580913b857234d75e6054a6f49d7932 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Tue, 18 Jul 2023 18:47:57 -0300
Subject: [PATCH 02/25] [ADD] import NFe wizard

---
 l10n_br_fiscal/models/document.py             |   2 +
 l10n_br_nfe/models/__init__.py                |   1 +
 l10n_br_nfe/models/document.py                |  25 ++
 l10n_br_nfe/models/product_product.py         |  36 +-
 l10n_br_nfe/models/product_supplierinfo.py    |  14 +
 l10n_br_nfe/wizards/__init__.py               |   5 +-
 l10n_br_nfe/wizards/import_document.py        | 346 ++++++++++++++++++
 l10n_br_nfe/wizards/import_document.xml       |  89 +++++
 .../l10n_br_account_nfe_export_invoice.py     |   1 -
 9 files changed, 514 insertions(+), 5 deletions(-)
 create mode 100644 l10n_br_nfe/models/product_supplierinfo.py
 create mode 100644 l10n_br_nfe/wizards/import_document.py
 create mode 100644 l10n_br_nfe/wizards/import_document.xml

diff --git a/l10n_br_fiscal/models/document.py b/l10n_br_fiscal/models/document.py
index d656680389ec..8a02dc2a5260 100644
--- a/l10n_br_fiscal/models/document.py
+++ b/l10n_br_fiscal/models/document.py
@@ -186,6 +186,8 @@ class Document(models.Model):
         store=True,
     )
 
+    imported_document = fields.Boolean(string="Imported", default=False)
+
     xml_error_message = fields.Text(
         readonly=True,
         string="XML validation errors",
diff --git a/l10n_br_nfe/models/__init__.py b/l10n_br_nfe/models/__init__.py
index 924492b05651..e8a09f1a5adc 100644
--- a/l10n_br_nfe/models/__init__.py
+++ b/l10n_br_nfe/models/__init__.py
@@ -5,6 +5,7 @@
 from . import res_partner
 from . import res_company
 from . import product_product
+from . import product_supplierinfo
 from . import ncm
 from . import nbm
 from . import cest
diff --git a/l10n_br_nfe/models/document.py b/l10n_br_nfe/models/document.py
index 96c3d1ce105c..732f49d08fac 100644
--- a/l10n_br_nfe/models/document.py
+++ b/l10n_br_nfe/models/document.py
@@ -10,6 +10,7 @@
 from unicodedata import normalize
 
 from erpbrasil.assinatura import certificado as cert
+from erpbrasil.base.fiscal import cnpj_cpf
 from erpbrasil.base.fiscal.edoc import ChaveEdoc
 from erpbrasil.edoc.pdf import base
 from erpbrasil.transmissao import TransmissaoSOAP
@@ -683,6 +684,15 @@ def _export_one2many(self, field_name, class_obj=None):
                 field_data.nItem = i
         return res
 
+    @api.model
+    def _prepare_import_dict(
+        self, values, model=None, parent_dict=None, defaults_model=None
+    ):
+        return {
+            **super()._prepare_import_dict(values, model, parent_dict, defaults_model),
+            "imported_document": True,
+        }
+
     def _build_attr(self, node, fields, vals, path, attr):
         key = "nfe40_%s" % (attr[0],)  # TODO schema wise
         value = getattr(node, attr[0])
@@ -1066,6 +1076,21 @@ def make_pdf(self):
             }
         )
 
+    def import_nfe_xml(self, xml, edoc_type="out"):
+        document = (
+            self.env["nfe.40.infnfe"]
+            .with_context(tracking_disable=True, edoc_type=edoc_type, dry_run=False)
+            .build_from_binding(xml.NFe.infNFe)
+        )
+
+        if edoc_type == "in" and document.company_id.cnpj_cpf != cnpj_cpf.formata(
+            xml.NFe.infNFe.emit.CNPJ
+        ):
+            document.fiscal_operation_type = "in"
+            document.issuer = "partner"
+
+        return document
+
     def temp_xml_autorizacao(self, xml_string):
         """TODO: Migrate-me to erpbrasil.edoc.pdf ASAP"""
         root = etree.fromstring(xml_string)
diff --git a/l10n_br_nfe/models/product_product.py b/l10n_br_nfe/models/product_product.py
index cf63cb4fa830..542700006dba 100644
--- a/l10n_br_nfe/models/product_product.py
+++ b/l10n_br_nfe/models/product_product.py
@@ -2,12 +2,41 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, models
+from odoo.osv import expression
 
 
 class ProductProduct(models.Model):
     _inherit = "product.product"
     _nfe_search_keys = ["default_code", "barcode"]
 
+    def match_or_create_m2o(self, rec_dict, parent_dict, model=None):
+        domain_name, domain_barcode, domain_default_code = [], [], []
+        if parent_dict.get("nfe40_xProd"):
+            rec_dict["name"] = parent_dict["nfe40_xProd"]
+            domain_name = [("name", "=", rec_dict.get("name"))]
+
+        if (
+            parent_dict.get("nfe40_cEANTrib")
+            and parent_dict["nfe40_cEANTrib"] != "SEM GTIN"
+        ):
+            rec_dict["barcode"] = parent_dict["nfe40_cEANTrib"]
+            domain_barcode = [("barcode", "=", rec_dict.get("barcode"))]
+
+        if parent_dict.get("nfe40_cProd"):
+            rec_dict["default_code"] = parent_dict["nfe40_cProd"]
+            domain_default_code = [("default_code", "=", rec_dict.get("default_code"))]
+
+        domain = expression.OR([domain_name, domain_barcode, domain_default_code])
+        match = self.search(domain, limit=1)
+        if match:
+            return match.id
+
+        if self._context.get("dry_run"):
+            rec_id = self.new(rec_dict).id
+        else:
+            rec_id = self.with_context(parent_dict=parent_dict).create(rec_dict).id
+        return rec_id
+
     @api.model
     def default_get(self, default_fields):
         """
@@ -31,8 +60,11 @@ def default_get(self, default_fields):
             values["list_price"] = parent_dict.get("nfe40_vUnCom")
 
         # Barcode
-        if parent_dict.get("nfe40_cEAN") and parent_dict["nfe40_cEAN"] != "SEM GTIN":
-            values["barcode"] = parent_dict["nfe40_cEAN"]
+        if (
+            parent_dict.get("nfe40_cEANTrib")
+            and parent_dict["nfe40_cEANTrib"] != "SEM GTIN"
+        ):
+            values["barcode"] = parent_dict["nfe40_cEANTrib"]
 
         # NCM
         if parent_dict.get("nfe40_NCM"):
diff --git a/l10n_br_nfe/models/product_supplierinfo.py b/l10n_br_nfe/models/product_supplierinfo.py
new file mode 100644
index 000000000000..21ff712bfdf8
--- /dev/null
+++ b/l10n_br_nfe/models/product_supplierinfo.py
@@ -0,0 +1,14 @@
+# Copyright (C) 2022  Renan Hiroki Bastos - Kmee
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from odoo import fields, models
+
+
+class SupplierInfo(models.Model):
+    _inherit = "product.supplierinfo"
+
+    partner_uom = fields.Many2one(
+        "uom.uom",
+        "Partner Unit of Measure",
+        help="This comes from the last imported document.",
+    )
diff --git a/l10n_br_nfe/wizards/__init__.py b/l10n_br_nfe/wizards/__init__.py
index 16be748dae5c..abfaf1f530dc 100644
--- a/l10n_br_nfe/wizards/__init__.py
+++ b/l10n_br_nfe/wizards/__init__.py
@@ -1,2 +1,3 @@
-from . import l10n_br_account_nfe_export_invoice
-from . import l10n_br_account_nfe_export
+# from . import l10n_br_account_nfe_export_invoice
+# from . import l10n_br_account_nfe_export
+from . import import_document
diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
new file mode 100644
index 000000000000..de3b9a209731
--- /dev/null
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -0,0 +1,346 @@
+# Copyright (C) 2021  Gabriel Cardoso de Faria - Kmee
+# Copyright (C) 2022  Renan Hiroki Bastos - Kmee
+# Copyright (C) 2023  Luiz Felipe do Divino - Kmee
+# Copyright (C) 2023  Felipe Zago Rodrigues - Kmee
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+import base64
+
+from erpbrasil.base.fiscal.edoc import detectar_chave_edoc
+from nfelib.nfe.bindings.v4_0.leiaute_nfe_v4_00 import TnfeProc
+
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
+from odoo.osv import expression
+
+
+class NfeImport(models.TransientModel):
+    """Importar XML Nota Fiscal Eletrônica"""
+
+    _name = "l10n_br_nfe.import_xml"
+    _inherit = "l10n_br_fiscal.document.import.wizard.mixin"
+
+    xml_partner_cpf_cnpj = fields.Char(string="Imported Partner Identification")
+
+    xml_partner_name = fields.Char(string="Imported Partner Name")
+
+    imported_products_ids = fields.One2many(
+        string="Imported Products",
+        comodel_name="l10n_br_nfe.import_xml.products",
+        inverse_name="import_xml_id",
+    )
+
+    nat_op = fields.Char(string="Natureza da Operação")
+
+    @api.onchange("xml")
+    def _onchange_xml(self):
+        if self.xml:
+            self.set_fields_by_xml_data()
+
+            if self.partner_id:
+                self.imported_products_ids._set_product_supplierinfo_data()
+
+    def set_fields_by_xml_data(self):
+        parsed_xml = self.parse_xml()
+        infNFe = parsed_xml.NFe.infNFe
+        document = self.get_document_by_xml(parsed_xml)
+
+        self.check_xml_data(parsed_xml)
+        self.document_key = document.chave
+        self.document_number = int(document.numero_documento)
+        self.document_serie = int(document.numero_serie)
+        self.xml_partner_cpf_cnpj = document.cnpj_cpf_emitente
+        self.xml_partner_name = infNFe.emit.xFant or infNFe.emit.xNome
+        self.partner_id = self.env["res.partner"].search(
+            [
+                "|",
+                ("cnpj_cpf", "=", document.cnpj_cpf_emitente),
+                ("nfe40_xNome", "=", infNFe.emit.xNome),
+            ],
+            limit=1,
+        )
+        self.nat_op = infNFe.ide.natOp
+        self._create_imported_products_by_xml(parsed_xml)
+
+    def parse_xml(self):
+        try:
+            binding = TnfeProc.from_xml(base64.b64decode(self.xml).decode())
+        except Exception as e:
+            raise UserError(_("Invalid file: %s" % e))
+        else:
+            return self._edit_parsed_xml(binding)
+
+    def get_document_by_xml(self, xml):
+        return detectar_chave_edoc(xml.NFe.infNFe.Id[3:])
+
+    def check_xml_data(self, xml):
+        document = self.get_document_by_xml(xml)
+        nfe_model_code = self.env.ref("l10n_br_fiscal.document_55").code
+
+        if document.modelo_documento != nfe_model_code:
+            raise UserError(
+                _(
+                    f"Incorrect fiscal document model! "
+                    f"Accepted one is {nfe_model_code}"
+                )
+            )
+
+    def _create_imported_products_by_xml(self, xml):
+        product_ids = []
+        for product in xml.NFe.infNFe.det:
+            product_ids.append(
+                self.env["l10n_br_nfe.import_xml.products"]
+                .create(self._prepare_imported_product_values(product))
+                .id
+            )
+
+        self.imported_products_ids = [(6, 0, product_ids)]
+
+    def _prepare_imported_product_values(self, product):
+        taxes = self._get_taxes_from_xml_product(product)
+        uom_id = self.env["uom.uom"].search([("code", "=", product.prod.uCom)], limit=1)
+
+        return {
+            "product_name": product.prod.xProd,
+            "product_code": product.prod.cProd,
+            "ncm_xml": product.prod.NCM,
+            "cfop_xml": product.prod.CFOP,
+            "product_id": self._match_product(product.prod),
+            "icms_percent": taxes["pICMS"],
+            "icms_value": taxes["vICMS"],
+            "ipi_percent": taxes["pIPI"],
+            "ipi_value": taxes["vIPI"],
+            "uom_internal": uom_id.id,
+            "uom_com": product.prod.uCom,
+            "quantity_com": product.prod.qCom,
+            "price_unit_com": product.prod.vUnCom,
+            "uom_trib": product.prod.uTrib,
+            "quantity_trib": product.prod.qTrib,
+            "price_unit_trib": product.prod.vUnTrib,
+            "total": product.prod.vProd,
+            "import_xml_id": self.id,
+        }
+
+    def _match_product(self, xml_product):
+        domain = []
+        if hasattr(xml_product, "cProd"):
+            domain = expression.OR([domain, [("default_code", "=", xml_product.cProd)]])
+
+        if hasattr(xml_product, "cEANTrib") and xml_product.cEANTrib != "SEM GTIN":
+            domain = expression.OR([domain, [("barcode", "=", xml_product.cEANTrib)]])
+
+        rec_id = False
+        if domain:
+            rec_id = self.env["product.product"].search(domain, limit=1).id
+        return rec_id
+
+    def _get_taxes_from_xml_product(self, product):
+        vICMS = 0
+        pICMS = 0
+        pIPI = 0
+        vIPI = 0
+        icms_tags = [tag for tag in dir(product.imposto.ICMS) if tag.startswith("ICMS")]
+        for tag in icms_tags:
+            if getattr(product.imposto.ICMS, tag) is not None:
+                icms_choice = getattr(product.imposto.ICMS, tag)
+        if hasattr(icms_choice, "pICMS"):
+            pICMS = icms_choice.pICMS
+        if hasattr(icms_choice, "vICMS"):
+            vICMS = icms_choice.vICMS
+        ipi_trib = product.imposto.IPI.IPITrib
+        if ipi_trib is not None:
+            if hasattr(ipi_trib, "pIPI"):
+                pIPI = ipi_trib.pIPI
+            if hasattr(ipi_trib, "vIPI"):
+                vIPI = ipi_trib.vIPI
+
+        return {"vICMS": vICMS, "pICMS": pICMS, "vIPI": vIPI, "pIPI": pIPI}
+
+    def import_xml(self):
+        self.document_id = self.create_edoc_from_xml()
+
+        return {
+            "name": _("Document Imported"),
+            "type": "ir.actions.act_window",
+            "target": "current",
+            "views": [[False, "form"]],
+            "res_id": self.document_id.id,
+            "res_model": "l10n_br_fiscal.document",
+        }
+
+    def create_edoc_from_xml(self):
+        self.set_fiscal_operation_type()
+
+        edoc = self.env["l10n_br_fiscal.document"].import_nfe_xml(
+            self.parse_xml(),
+            edoc_type=self.fiscal_operation_type,
+        )
+
+        if not self.partner_id:
+            self.partner_id = edoc.partner_id
+
+        self._attach_original_nfe_xml_to_document(edoc)
+        self.imported_products_ids._find_or_create_product_supplierinfo()
+
+        return edoc
+
+    def set_fiscal_operation_type(self):
+        document = self.get_document_by_xml(self.parse_xml())
+
+        if document.cnpj_cpf_emitente == self.company_id.cnpj_cpf:
+            self.fiscal_operation_type = "out"
+        else:
+            self.fiscal_operation_type = "in"
+
+    def _attach_original_nfe_xml_to_document(self, edoc):
+        return self.env["ir.attachment"].create(
+            {
+                "name": "NFe-Importada-{}.xml".format(edoc.document_key),
+                "datas": base64.b64decode(self.xml),
+                "description": "XML NFe - Importada por XML",
+                "res_model": "l10n_br_fiscal.document",
+                "res_id": edoc.id,
+            }
+        )
+
+    def _edit_parsed_xml(self, parsed_xml):
+        for product_line in self.imported_products_ids.filtered("product_id"):
+            internal_product = product_line.product_id
+            for xml_product in parsed_xml.NFe.infNFe.det:
+                xml_product.prod.xProd = internal_product.name
+                xml_product.prod.cProd = internal_product.default_code
+                xml_product.prod.cEAN = internal_product.barcode or "SEM GTIN"
+                xml_product.prod.cEANTrib = internal_product.barcode or "SEM GTIN"
+                xml_product.prod.uCom = product_line.uom_internal.code
+                if product_line.new_cfop_id:
+                    xml_product.prod.CFOP = product_line.new_cfop_id.code
+        return parsed_xml
+
+
+class NfeImportProducts(models.TransientModel):
+    _name = "l10n_br_nfe.import_xml.products"
+
+    product_name = fields.Char(string="Product Name")
+
+    uom_com = fields.Char(string="UOM Comercial")
+
+    quantity_com = fields.Float(string="Comercial Quantity")
+
+    price_unit_com = fields.Float(string="Comercial Price Unit")
+
+    uom_trib = fields.Char(string="UOM Fiscal")
+
+    quantity_trib = fields.Float(string="Fiscal Quantity")
+
+    price_unit_trib = fields.Float(string="Fiscal Price Unit")
+
+    total = fields.Float(string="Total")
+
+    import_xml_id = fields.Many2one(comodel_name="l10n_br_nfe.import_xml")
+
+    product_code = fields.Char(string="Partner Product Code")
+
+    product_id = fields.Many2one(
+        comodel_name="product.product",
+        string="Product Internal Reference",
+    )
+
+    product_supplier_id = fields.Many2one(
+        comodel_name="product.supplierinfo",
+        string="Product Supplier",
+    )
+
+    uom_internal = fields.Many2one(
+        related="product_supplier_id.partner_uom",
+        help="Internal UoM, equivalent to the comercial one in the document",
+    )
+
+    ncm_xml = fields.Char(string="XML NCM Code")
+
+    ncm_internal = fields.Char(
+        related="product_id.ncm_id.code",
+        string="Internal NCM Code",
+    )
+
+    cfop_xml = fields.Char(string="XML CFOP")
+
+    new_cfop_id = fields.Many2one(
+        comodel_name="l10n_br_fiscal.cfop",
+        string="Change CFOP",
+    )
+
+    icms_percent = fields.Char(string="Alíquota ICMS")
+
+    icms_value = fields.Char(string="ICMS Value")
+
+    ipi_percent = fields.Char(string="Alíquota IPI")
+
+    ipi_value = fields.Char(string="IPI Value")
+
+    imported_partner_id = fields.Many2one(related="import_xml_id.partner_id")
+
+    @api.onchange("product_id")
+    def onchange_product_id(self):
+        if self.product_id and not self.product_id.ncm_id:
+            raise UserError(_("Product without NCM!"))
+
+    def _search_product_supplier(self):
+        return self.env["product.supplierinfo"].search(
+            [
+                ("name", "=", self.imported_partner_id.id),
+                "|",
+                ("product_name", "=", self.product_name),
+                ("product_code", "=", self.product_code),
+            ],
+            limit=1,
+        )
+
+    def _set_product_supplierinfo_data(self):
+        for product in self:
+            if not product.product_supplier_id:
+                product.product_supplier_id = product._search_product_supplier()
+
+            if product.product_supplier_id:
+                product.product_id = product.product_supplier_id.product_id
+
+    def _find_or_create_product_supplierinfo(self):
+        for product in self:
+            if not product.product_id:
+                product.product_id = self.env["product.product"].search(
+                    [("default_code", "=", product.product_code)], limit=1
+                )
+
+            if not product.product_id:
+                continue
+
+            if not product.product_supplier_id:
+                product.product_supplier_id = product._search_product_supplier()
+
+                if not product.product_supplier_id:
+                    product._create_product_supplier()
+            else:
+                product._update_product_supplier()
+
+    def _create_product_supplier(self):
+        self.product_supplier_id = self.env["product.supplierinfo"].create(
+            {
+                "product_id": self.product_id.id,
+                "product_name": self.product_name,
+                "product_code": self.product_code,
+                "price": self.product_id.lst_price,
+                "name": self.imported_partner_id.id,
+            }
+        )
+        self.product_id.write({"seller_ids": [(4, self.product_supplier_id.id)]})
+
+    def _update_product_supplier(self):
+        self.product_supplier_id.write(
+            {
+                "product_id": self.product_id.id,
+                "product_name": self.product_name,
+                "product_code": self.product_code,
+                "price": self.uom_internal._compute_price(
+                    self.price_unit_com, self.product_id.uom_id
+                ),
+            }
+        )
diff --git a/l10n_br_nfe/wizards/import_document.xml b/l10n_br_nfe/wizards/import_document.xml
new file mode 100644
index 000000000000..01029d60a4f0
--- /dev/null
+++ b/l10n_br_nfe/wizards/import_document.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2023 KMEE
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record id="l10n_br_nfe_import_xml_form" model="ir.ui.view">
+        <field name="name">l10n_br_nfe.import_xml.form</field>
+        <field name="model">l10n_br_nfe.import_xml</field>
+        <field
+            name="inherit_id"
+            ref="l10n_br_fiscal.l10n_br_fiscal_document_import_wizard_mixin_form"
+        />
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='document_serie']" position="after">
+                <field name="nat_op" readonly="1" />
+            </xpath>
+
+            <xpath expr="//field[@name='partner_id']" position="before">
+                <field name="xml_partner_cpf_cnpj" readonly="1" />
+                <field name="xml_partner_name" readonly="1" />
+            </xpath>
+
+            <xpath expr="//group[@id='document_info']" position="after">
+                <separator
+                    string="NFe XML Products"
+                    attrs="{'invisible': [('xml', '=', False)]}"
+                />
+                <group
+                    id="imported_products"
+                    attrs="{'invisible': [('xml', '=', False)]}"
+                >
+                    <field name="imported_products_ids" nolabel="1" />
+                </group>
+            </xpath>
+
+            <xpath expr="//footer" position="inside">
+                <button
+                    name="import_xml"
+                    string="Import"
+                    class="btn-primary"
+                    type="object"
+                    attrs="{'invisible': [('importing_type', '!=', 'xml_file')]}"
+                />
+                <button string="Cancel" class="btn-default" special="cancel" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="l10n_br_nfe_import_xml_products_tree" model="ir.ui.view">
+        <field name="name">l10n_br_nfe.import_xml.products.tree</field>
+        <field name="model">l10n_br_nfe.import_xml.products</field>
+        <field name="arch" type="xml">
+            <tree string="Views" editable="top">
+                <field
+                    name="product_id"
+                    options="{'no_quick_create': True, 'no_create': True}"
+                    domain="[('purchase_ok', '=', True)]"
+                />
+                <field name="product_name" readonly="1" />
+                <field name="ncm_xml" readonly="1" />
+                <field name="ncm_internal" />
+                <field
+                    name="uom_internal"
+                    options="{'no_quick_create': True, 'no_create': True}"
+                />
+                <field name="cfop_xml" readonly="1" />
+                <field name="new_cfop_id" />
+                <field name="icms_percent" readonly="1" />
+                <field name="icms_value" readonly="1" />
+                <field name="ipi_percent" readonly="1" />
+                <field name="ipi_value" readonly="1" />
+                <field name="quantity_com" readonly="1" />
+                <field name="uom_com" readonly="1" />
+                <field name="price_unit_com" readonly="1" />
+                <field name="total" readonly="1" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="l10n_br_nfe_import_xml_action" model="ir.actions.act_window">
+        <field name="name">Importar NF-e XML</field>
+        <field name="res_model">l10n_br_nfe.import_xml</field>
+        <field name="view_mode">form</field>
+        <field name="context">{}</field>
+        <field name="target">new</field>
+    </record>
+
+</odoo>
diff --git a/l10n_br_nfe/wizards/l10n_br_account_nfe_export_invoice.py b/l10n_br_nfe/wizards/l10n_br_account_nfe_export_invoice.py
index f07837130544..dd2f2272f29b 100644
--- a/l10n_br_nfe/wizards/l10n_br_account_nfe_export_invoice.py
+++ b/l10n_br_nfe/wizards/l10n_br_account_nfe_export_invoice.py
@@ -153,7 +153,6 @@ def nfe_export(self):
         view_id = view_rec and view_rec.id or False
 
         return {
-            "view_type": "form",
             "view_id": [view_id],
             "view_mode": "form",
             "res_model": "l10n_br_account_product.nfe_export_invoice",

From 7c231a3f4410dbd461241c00a938da481b351b32 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Tue, 18 Jul 2023 18:49:12 -0300
Subject: [PATCH 03/25] [ADD] import NFe views

---
 l10n_br_nfe/__init__.py                 |  2 ++
 l10n_br_nfe/__manifest__.py             |  8 +++++
 l10n_br_nfe/views/nfe_action.xml        | 15 ++++++++++
 l10n_br_nfe/views/nfe_document_view.xml | 40 +++++++++++++++++++++++++
 l10n_br_nfe/views/nfe_menu.xml          | 30 +++++++++----------
 5 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/l10n_br_nfe/__init__.py b/l10n_br_nfe/__init__.py
index 2dcd0c7c5edf..3ac01099642d 100644
--- a/l10n_br_nfe/__init__.py
+++ b/l10n_br_nfe/__init__.py
@@ -2,3 +2,5 @@
 
 from .hooks import post_init_hook
 from . import models
+from . import tests
+from . import wizards
diff --git a/l10n_br_nfe/__manifest__.py b/l10n_br_nfe/__manifest__.py
index 98710ae1d1b7..5a0562f9d8a8 100644
--- a/l10n_br_nfe/__manifest__.py
+++ b/l10n_br_nfe/__manifest__.py
@@ -1,6 +1,7 @@
 # Copyright (C) 2019  Renato Lima - Akretion
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
+
 {
     "name": "NF-e",
     "summary": "Brazilian Eletronic Invoice NF-e",
@@ -24,6 +25,7 @@
         # Security
         "security/ir_model_access.xml",
         "security/nfe_security.xml",
+        "security/ir.model.access.csv",
         # Views
         "views/res_company_view.xml",
         "views/nfe_document_view.xml",
@@ -33,6 +35,12 @@
         # Report
         "report/reports.xml",
         "report/danfe_nfce.xml",
+        # Wizards
+        "wizards/import_document.xml",
+        # Actions,
+        "views/nfe_action.xml",
+        # Menus
+        "views/nfe_menu.xml",
     ],
     "demo": [
         "demo/res_users_demo.xml",
diff --git a/l10n_br_nfe/views/nfe_action.xml b/l10n_br_nfe/views/nfe_action.xml
index 8c34eac7f557..00c65849e2dc 100644
--- a/l10n_br_nfe/views/nfe_action.xml
+++ b/l10n_br_nfe/views/nfe_action.xml
@@ -21,4 +21,19 @@
         </field>
     </record>
 
+    <!-- Imported Documents Action -->
+    <record id="imported_document_action" model="ir.actions.act_window">
+        <field name="name">Imported Document</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">l10n_br_fiscal.document</field>
+        <field name="view_mode">tree,kanban,form</field>
+        <field name="search_view_id" ref="l10n_br_fiscal.document_search" />
+        <field name="view_id" ref="l10n_br_fiscal.document_tree" />
+        <field name="domain">[('imported_document', '=', True)]</field>
+        <field name="context">{'default_fiscal_operation_type': 'in'}</field>
+        <field name="help" type="html">
+          <p class="o_view_nocontent_smiling_face" />
+        </field>
+    </record>
+
 </odoo>
diff --git a/l10n_br_nfe/views/nfe_document_view.xml b/l10n_br_nfe/views/nfe_document_view.xml
index 0b49b45853ad..cc31ef4fe28b 100644
--- a/l10n_br_nfe/views/nfe_document_view.xml
+++ b/l10n_br_nfe/views/nfe_document_view.xml
@@ -91,6 +91,46 @@
                     </group>
             </group>
           </page>
+
+            <!-- Hide confirm button for imported documents -->
+            <xpath expr="//form/field[@name='document_type']" position="after">
+                <field name="imported_document" invisible="1" />
+            </xpath>
+            <xpath
+                expr="//header/button[@name='action_document_confirm']"
+                position="attributes"
+            >
+                <attribute
+                    name="attrs"
+                >{'invisible': ['|', ('state_edoc', '!=', 'em_digitacao'), ('imported_document', '=', True)]}</attribute>
+            </xpath>
+
+            <!-- Hide buttons for imported documents -->
+            <xpath
+                expr="//header/button[@name='action_document_correction']"
+                position="attributes"
+            >
+                <attribute
+                    name="attrs"
+                >{'invisible': ['|', ('state_edoc', '!=', 'autorizada'), ('imported_document', '=', True)]}</attribute>
+            </xpath>
+            <xpath
+                expr="//header/button[@name='action_create_return']"
+                position="attributes"
+            >
+                <attribute
+                    name="attrs"
+                >{'invisible': ['|', ('state_edoc', '!=', 'autorizada'), ('imported_document', '=', True)]}</attribute>
+            </xpath>
+            <xpath
+                expr="//header/button[@name='action_document_cancel']"
+                position="attributes"
+            >
+                <attribute
+                    name="attrs"
+                >{'invisible': ['|', '|', ('state_edoc', '!=', 'autorizada'), ('document_electronic', '=', False), ('imported_document', '=', True)]}</attribute>
+            </xpath>
+
           <page name="others" position="inside">
               <group
                     name="nfe_autxml"
diff --git a/l10n_br_nfe/views/nfe_menu.xml b/l10n_br_nfe/views/nfe_menu.xml
index 2820cdc1cff8..ee5f36acbd27 100644
--- a/l10n_br_nfe/views/nfe_menu.xml
+++ b/l10n_br_nfe/views/nfe_menu.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
-  # NFe Main Menu
-  <menuitem
-        id="nfe_menu"
-        name="NF-es"
-        groups="l10n_br_nfe.group_user"
-        parent="l10n_br_fiscal.document_menu"
-        sequence="10"
+    <menuitem
+        id="nfe_import_document"
+        action="l10n_br_nfe_import_xml_action"
+        name="Import NF-e"
+        parent="l10n_br_fiscal.document_sub_menu"
+        sequence="46"
+        groups="l10n_br_fiscal.group_manager"
     />
 
-  # NFe Fiscal Documents
-  <menuitem
-        id="nfe_document_menu"
-        action="nfe_document_action"
-        name="NF-e"
-        groups="l10n_br_nfe.group_user"
-        parent="nfe_menu"
-        sequence="10"
+    <!-- Imported Documents Menu-->
+    <menuitem
+        id="imported_document_menu"
+        action="imported_document_action"
+        name="Imported Document"
+        parent="l10n_br_fiscal.document_sub_menu"
+        sequence="20"
+        groups="l10n_br_fiscal.group_user,l10n_br_fiscal.group_manager"
     />
 
 </odoo>

From 557c4fee4e3641ded9d6b5567266d11129ec84b4 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Tue, 18 Jul 2023 18:49:35 -0300
Subject: [PATCH 04/25] [ADD] import NFe tests

---
 l10n_br_nfe/hooks.py                          |   2 +-
 l10n_br_nfe/tests/__init__.py                 |   1 +
 ...81583054000129550010000000052062777166.xml | 161 ++++++++++++
 l10n_br_nfe/tests/test_nfe_import.py          |   5 +-
 l10n_br_nfe/tests/test_nfe_import_wizard.py   | 234 ++++++++++++++++++
 l10n_br_nfe/tests/test_nfe_serialize.py       |  41 ++-
 6 files changed, 420 insertions(+), 24 deletions(-)
 create mode 100644 l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200181583054000129550010000000052062777166.xml
 create mode 100644 l10n_br_nfe/tests/test_nfe_import_wizard.py

diff --git a/l10n_br_nfe/hooks.py b/l10n_br_nfe/hooks.py
index 0914878978fe..6b86ab18855a 100644
--- a/l10n_br_nfe/hooks.py
+++ b/l10n_br_nfe/hooks.py
@@ -47,7 +47,7 @@ def post_init_hook(cr, registry):
             existing_nfes.unlink()
             nfe = (
                 env["nfe.40.infnfe"]
-                .with_context(tracking_disable=True, edoc_type="in", lang="pt_BR")
+                .with_context(tracking_disable=True, edoc_type="in")
                 .build_from_binding(binding.NFe.infNFe)
             )
             _logger.info(nfe.nfe40_emit.nfe40_CNPJ)
diff --git a/l10n_br_nfe/tests/__init__.py b/l10n_br_nfe/tests/__init__.py
index 2e5c0de0ae51..5bcaa890ddec 100644
--- a/l10n_br_nfe/tests/__init__.py
+++ b/l10n_br_nfe/tests/__init__.py
@@ -1,6 +1,7 @@
 from . import test_nfce
 from . import test_nfe_structure
 from . import test_nfe_import
+from . import test_nfe_import_wizard
 from . import test_nfe_serialize
 from . import test_nfe_serialize_lc
 from . import test_nfe_serialize_sn
diff --git a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200181583054000129550010000000052062777166.xml b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200181583054000129550010000000052062777166.xml
new file mode 100644
index 000000000000..f59f22ea44ce
--- /dev/null
+++ b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200181583054000129550010000000052062777166.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<nfeProc versao="4.00" xmlns="http://www.portalfiscal.inf.br/nfe">
+    <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
+        <infNFe versao="4.00" Id="NFe35200181583054000129550010000000052062777166">
+            <ide>
+                <cUF>35</cUF>
+                <cNF>06277716</cNF>
+                <natOp>Venda</natOp>
+                <mod>55</mod>
+                <serie>1</serie>
+                <nNF>5</nNF>
+                <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
+                <dhSaiEnt>2020-01-01T12:00:00+01:00</dhSaiEnt>
+                <tpNF>1</tpNF>
+                <idDest>1</idDest>
+                <cMunFG>3501152</cMunFG>
+                <tpImp>1</tpImp>
+                <tpEmis>1</tpEmis>
+                <cDV>1</cDV>
+                <tpAmb>2</tpAmb>
+                <finNFe>1</finNFe>
+                <indFinal>1</indFinal>
+                <indPres>0</indPres>
+                <procEmi>0</procEmi>
+                <verProc>Odoo Brasil OCA 12.0</verProc>
+            </ide>
+            <emit>
+                <CNPJ>81583054000129</CNPJ>
+                <xNome>Empresa Lucro Presumido Ltda</xNome>
+                <xFant>Empresa Lucro Presumido</xFant>
+                <enderEmit>
+                    <xLgr>Avenida Paulista</xLgr>
+                    <nro>1</nro>
+                    <xBairro>Bela Vista</xBairro>
+                    <cMun>3550308</cMun>
+                    <xMun>São Paulo</xMun>
+                    <UF>SP</UF>
+                    <CEP>01311000</CEP>
+                    <cPais>1058</cPais>
+                    <xPais>Brasil</xPais>
+                    <fone>551199999999</fone>
+                </enderEmit>
+                <IE>078016350838</IE>
+                <CRT>3</CRT>
+            </emit>
+            <dest>
+                <CNPJ>81493979000189</CNPJ>
+                <xNome
+                >NF-E EMITIDA EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+                <enderDest>
+                    <xLgr>Rua Samuel Morse</xLgr>
+                    <nro>135</nro>
+                    <xCpl>20º andar - Conjunto 151</xCpl>
+                    <xBairro>Brooklin</xBairro>
+                    <cMun>3550308</cMun>
+                    <xMun>São Paulo</xMun>
+                    <UF>SP</UF>
+                    <CEP>04576060</CEP>
+                    <cPais>1058</cPais>
+                    <xPais>Brasil</xPais>
+                    <fone>551134782150</fone>
+                </enderDest>
+                <indIEDest>1</indIEDest>
+                <IE>460429771334</IE>
+                <email>cliente1@cliente1.com.br</email>
+            </dest>
+            <det nItem="1">
+                <prod>
+                    <cProd>E-COM11</cProd>
+                    <cEAN>SEM GTIN</cEAN>
+                    <xProd>Cabinet with Doors</xProd>
+                    <NCM>94033000</NCM>
+                    <CFOP>5102</CFOP>
+                    <uCom>UNID</uCom>
+                    <qCom>1.0000</qCom>
+                    <vUnCom>14.0000000000</vUnCom>
+                    <vProd>14.00</vProd>
+                    <cEANTrib>SEM GTIN</cEANTrib>
+                    <uTrib>UNID</uTrib>
+                    <qTrib>1.0000</qTrib>
+                    <vUnTrib>14.0000000000</vUnTrib>
+                    <indTot>1</indTot>
+                </prod>
+                <imposto>
+                    <vTotTrib>0.00</vTotTrib>
+                    <ICMS>
+                        <ICMSSN101>
+                            <orig>0</orig>
+                            <CSOSN>101</CSOSN>
+                            <pCredSN>2.7000</pCredSN>
+                            <vCredICMSSN>0.38</vCredICMSSN>
+                        </ICMSSN101>
+                    </ICMS>
+                    <IPI>
+                        <cEnq>999</cEnq>
+                        <IPINT>
+                            <CST>53</CST>
+                        </IPINT>
+                    </IPI>
+                    <PIS>
+                        <PISOutr>
+                            <CST>49</CST>
+                            <vBC>0.00</vBC>
+                            <pPIS>0.0000</pPIS>
+                            <vPIS>0.00</vPIS>
+                        </PISOutr>
+                    </PIS>
+                    <COFINS>
+                        <COFINSOutr>
+                            <CST>49</CST>
+                            <vBC>0.00</vBC>
+                            <pCOFINS>0.0000</pCOFINS>
+                            <vCOFINS>0.00</vCOFINS>
+                        </COFINSOutr>
+                    </COFINS>
+                </imposto>
+            </det>
+            <total>
+                <ICMSTot>
+                    <vBC>0.00</vBC>
+                    <vICMS>0.00</vICMS>
+                    <vICMSDeson>0.00</vICMSDeson>
+                    <vFCPUFDest>0.00</vFCPUFDest>
+                    <vICMSUFDest>0.00</vICMSUFDest>
+                    <vICMSUFRemet>0.00</vICMSUFRemet>
+                    <vFCP>0.00</vFCP>
+                    <vBCST>0.00</vBCST>
+                    <vST>0.00</vST>
+                    <vFCPST>0.00</vFCPST>
+                    <vFCPSTRet>0.00</vFCPSTRet>
+                    <vProd>14.00</vProd>
+                    <vFrete>0.00</vFrete>
+                    <vSeg>0.00</vSeg>
+                    <vDesc>0.00</vDesc>
+                    <vII>0.00</vII>
+                    <vIPI>0.00</vIPI>
+                    <vIPIDevol>0.00</vIPIDevol>
+                    <vPIS>0.00</vPIS>
+                    <vCOFINS>0.00</vCOFINS>
+                    <vOutro>0.00</vOutro>
+                    <vNF>14.00</vNF>
+                    <vTotTrib>0.00</vTotTrib>
+                </ICMSTot>
+            </total>
+            <transp>
+                <modFrete>9</modFrete>
+            </transp>
+            <pag>
+                <detPag>
+                    <indPag>0</indPag>
+                    <tPag>01</tPag>
+                    <vPag>14.00</vPag>
+                </detPag>
+                <vTroco>0.00</vTroco>
+            </pag>
+            <infAdic>
+                <infAdFisco>Documento emitido por: Marc Demo</infAdFisco>
+            </infAdic>
+        </infNFe>
+    </NFe>
+</nfeProc>
diff --git a/l10n_br_nfe/tests/test_nfe_import.py b/l10n_br_nfe/tests/test_nfe_import.py
index 37f3164ca3d7..0130c9fca078 100644
--- a/l10n_br_nfe/tests/test_nfe_import.py
+++ b/l10n_br_nfe/tests/test_nfe_import.py
@@ -33,7 +33,7 @@ def test_import_in_nfe_dry_run(self):
 
         nfe = (
             self.env["nfe.40.infnfe"]
-            .with_context(tracking_disable=True, edoc_type="in", lang="pt_BR")
+            .with_context(tracking_disable=True, edoc_type="in")
             .build_from_binding(binding.NFe.infNFe, dry_run=True)
         )
         assert isinstance(nfe.id, NewId)
@@ -57,7 +57,7 @@ def test_import_in_nfe(self):
         binding = TnfeProc.from_xml(nfe_stream.read().decode())
         nfe = (
             self.env["nfe.40.infnfe"]
-            .with_context(tracking_disable=True, edoc_type="in", lang="pt_BR")
+            .with_context(tracking_disable=True, edoc_type="in")
             .build_from_binding(binding.NFe.infNFe, dry_run=False)
         )
 
@@ -78,6 +78,7 @@ def _check_nfe(self, nfe):
         self.assertEqual(nfe.partner_id.legal_name, "Alimentos Ltda.")
 
         # enderDest
+        nfe.partner_id._inverse_nfe40_CEP()
         self.assertEqual(nfe.partner_id.street_name, "Rua Fonseca")  # related xLgr
         self.assertEqual(nfe.partner_id.zip, "13877-123")
         self.assertEqual(nfe.partner_id.nfe40_CEP, "13877123")
diff --git a/l10n_br_nfe/tests/test_nfe_import_wizard.py b/l10n_br_nfe/tests/test_nfe_import_wizard.py
new file mode 100644
index 000000000000..39fcc35376a5
--- /dev/null
+++ b/l10n_br_nfe/tests/test_nfe_import_wizard.py
@@ -0,0 +1,234 @@
+import base64
+import os
+import re
+from unittest.mock import MagicMock, patch
+
+from odoo.exceptions import UserError
+from odoo.tests import SavepointCase
+
+from odoo.addons import l10n_br_nfe
+
+from ..wizards.import_document import NfeImport
+
+
+class NFeImportWizardTest(SavepointCase):
+    def setUp(self):
+        super(NFeImportWizardTest, self).setUp()
+
+        def test_xml_path(filename):
+            return os.path.join(
+                l10n_br_nfe.__path__[0],
+                "tests",
+                "nfe",
+                "v4_00",
+                "leiauteNFe",
+                filename,
+            )
+
+        path_1 = test_xml_path("NFe35200181583054000129550010000000052062777166.xml")
+        with open(path_1, "rb") as f:
+            self.xml_1 = f.read()
+
+        self.wizard = False
+        self.product_1 = self.env["product.product"].create({"name": "Product Test 1"})
+        self.partner_1 = self.env["res.partner"].create({"name": "Partner Test 1"})
+
+    def _prepare_wizard(self, xml):
+        self.wizard = self.env["l10n_br_nfe.import_xml"].create(
+            {
+                "company_id": self.env.ref("base.main_company").id,
+                "importing_type": "xml_file",
+                "xml": base64.b64encode(xml),
+            }
+        )
+        self.wizard._onchange_xml()
+
+    def check_edoc(self, edoc):
+        self.assertEqual(
+            len(self.wizard.imported_products_ids),
+            len(edoc.fiscal_line_ids),
+        )
+        self.assertTrue(edoc.partner_id)
+        self.assertEqual(
+            self.wizard.xml_partner_cpf_cnpj,
+            edoc.partner_id.cnpj_cpf,
+        )
+        self.assertEqual(
+            self.wizard.xml_partner_name,
+            edoc.partner_id.name,
+        )
+
+    def test_import_nfe_xml(self):
+        xml = "dummy"
+        with self.assertRaises(UserError):
+            self._prepare_wizard(xml.encode("utf-8"))
+
+        mock_document = MagicMock(spec=["modelo_documento"])
+        mock_document.modelo_documento = "65"
+        with patch.object(
+            NfeImport, "get_document_by_xml", return_value=mock_document
+        ), self.assertRaises(UserError):
+            self.wizard.check_xml_data(self.wizard.parse_xml())
+
+        self._prepare_wizard(self.xml_1)
+        self.wizard.import_xml()
+
+        first_imported_product = self.wizard.imported_products_ids[0]
+
+        self.assertEqual(
+            self.wizard.document_key, "35200181583054000129550010000000052062777166"
+        )
+        self.assertEqual(self.wizard.document_number, "5")
+        self.assertEqual(self.wizard.document_serie, "1")
+        self.assertEqual(self.wizard.xml_partner_cpf_cnpj, "81.583.054/0001-29")
+        self.assertEqual(self.wizard.xml_partner_name, "Empresa Lucro Presumido")
+        self.assertEqual(
+            self.wizard.partner_id,
+            self.env.ref("l10n_br_base.lucro_presumido_partner"),
+        )
+        self.assertEqual(
+            f"[{first_imported_product.product_code}] "
+            f"{first_imported_product.product_name}",
+            "[E-COM11] Cabinet with Doors",
+        )
+        self.assertEqual(first_imported_product.uom_com, "UNID")
+        self.assertEqual(first_imported_product.quantity_com, 1)
+        self.assertEqual(first_imported_product.price_unit_com, 14)
+        self.assertEqual(first_imported_product.uom_trib, "UNID")
+        self.assertEqual(first_imported_product.quantity_trib, 1)
+        self.assertEqual(first_imported_product.price_unit_trib, 14)
+        self.assertEqual(first_imported_product.total, 14)
+
+    def test_import_xml(self):
+        self._prepare_wizard(self.xml_1)
+        self.wizard.import_xml()
+
+        self.check_edoc(self.wizard.document_id)
+
+    def test_create_edoc_from_xml(self):
+        self._prepare_wizard(self.xml_1)
+
+        self.wizard.partner_id = False
+        edoc = self.wizard.create_edoc_from_xml()
+        self.assertEqual(self.wizard.partner_id, edoc.partner_id)
+
+        self.check_edoc(edoc)
+
+    def test_set_fiscal_operation_type(self):
+        self._prepare_wizard(self.xml_1)
+
+        doc = self.wizard.get_document_by_xml(self.wizard.parse_xml())
+        origin_company = self.wizard.company_id
+
+        doc_company_id = self.env["res.company"].search(
+            [("nfe40_CNPJ", "=", re.sub("[^0-9]", "", doc.cnpj_cpf_emitente))], limit=1
+        )
+        self.wizard.company_id = doc_company_id
+        self.wizard.set_fiscal_operation_type()
+        self.assertEqual(self.wizard.fiscal_operation_type, "out")
+
+        self.wizard.company_id = origin_company
+        self.wizard.set_fiscal_operation_type()
+        self.assertEqual(self.wizard.fiscal_operation_type, "in")
+
+    def test_imported_products(self):
+        self._prepare_wizard(self.xml_1)
+        self.wizard.import_xml()
+        first_product = self.wizard.imported_products_ids[0]
+        old_product_id = first_product.product_id
+
+        first_product.onchange_product_id()
+        first_product.product_id = self.product_1
+        with self.assertRaises(UserError):
+            first_product.onchange_product_id()
+
+        first_product.product_id = False
+        first_product.product_name = False
+        first_product.product_code = "???"
+        first_product.product_supplier_id = False
+        first_product._find_or_create_product_supplierinfo()
+        self.assertFalse(first_product.product_supplier_id)
+
+        first_product.product_id = old_product_id
+        self.assertNotEqual(first_product.product_id, self.product_1)
+
+        self.supplier_info = self.env["product.supplierinfo"].create(
+            {
+                "product_id": self.product_1.id,
+                "name": self.partner_1.id,
+                "partner_uom": self.env["uom.uom"].search([], limit=1).id,
+                "price": 100,
+            }
+        )
+        self.wizard.partner_id = self.partner_1
+
+        first_product.product_code = False
+        first_product._set_product_supplierinfo_data()
+        wiz_supplier_id = first_product.product_supplier_id
+        self.assertEqual(wiz_supplier_id, self.supplier_info)
+        self.assertEqual(first_product.product_id, self.supplier_info.product_id)
+
+        first_product._find_or_create_product_supplierinfo()
+        self.assertEqual(wiz_supplier_id.product_id, first_product.product_id)
+        self.assertEqual(wiz_supplier_id.partner_uom, first_product.uom_internal)
+        self.assertEqual(wiz_supplier_id.product_code, first_product.product_code)
+        self.assertEqual(wiz_supplier_id.product_name, first_product.product_name)
+
+    def test_match_xml_product(self):
+        self._prepare_wizard(self.xml_1)
+
+        xml = self.wizard.parse_xml()
+        xml_product_1 = xml.NFe.infNFe.det[0].prod
+        prod_id = self.wizard._match_product(xml_product_1)
+        self.assertEqual(prod_id, self.env.ref("product.product_product_10").id)
+
+        prod_code = self.env["product.product"].create(
+            {
+                "name": "TEST1",
+                "default_code": "TEST123",
+            }
+        )
+
+        mock_code = MagicMock(spec=["cProd"])
+        mock_code.cProd = "TEST123"
+        prod_id = self.wizard._match_product(mock_code)
+
+        mock_code = MagicMock(spec=["cProd"])
+        mock_code.cProd = "TEST123"
+        prod_id = self.wizard._match_product(mock_code)
+        self.assertEqual(prod_id, prod_code.id)
+
+        prod_code.unlink()
+        prod_barcode = self.env["product.product"].create(
+            {"name": "TEST2", "barcode": "123456789123"}
+        )
+        mock_barcode = MagicMock(spec=["cEANTrib"])
+        mock_barcode.cEANTrib = "123456789123"
+        prod_id = self.wizard._match_product(mock_barcode)
+        self.assertEqual(prod_id, prod_barcode.id)
+
+        prod_barcode.unlink()
+        prod_id = self.wizard._match_product(MagicMock())
+        self.assertFalse(prod_id)
+
+    def test_parse_xml(self):
+        self._prepare_wizard(self.xml_1)
+
+        first_product = self.wizard.imported_products_ids[0]
+        first_product.new_cfop_id = self.env.ref("l10n_br_fiscal.cfop_5111").id
+
+        xml = self.wizard.parse_xml()
+        first_xml_product = xml.NFe.infNFe.det[0].prod
+        self.assertEqual(first_xml_product.CFOP, "5111")
+
+        mock_prod = MagicMock(spec=["imposto"])
+        mock_prod.imposto.ICMS.ICMS60.pICMS = 60
+        mock_prod.imposto.ICMS.ICMS60.vICMS = 100
+        mock_prod.imposto.IPI.IPITrib.pIPI = 5
+        mock_prod.imposto.IPI.IPITrib.vIPI = 100
+        taxes = self.wizard._get_taxes_from_xml_product(mock_prod)
+
+        self.assertEqual(taxes["pICMS"], 60)
+        self.assertEqual(taxes["vICMS"], 100)
+        self.assertEqual(taxes["pIPI"], 5)
+        self.assertEqual(taxes["vIPI"], 100)
diff --git a/l10n_br_nfe/tests/test_nfe_serialize.py b/l10n_br_nfe/tests/test_nfe_serialize.py
index 1eb7298fb624..6994f876fc78 100644
--- a/l10n_br_nfe/tests/test_nfe_serialize.py
+++ b/l10n_br_nfe/tests/test_nfe_serialize.py
@@ -63,26 +63,25 @@ def prepare_test_nfe(self, nfe):
         )
         nfe.date_in_out = datetime.strptime("2020-01-01T11:00:00", "%Y-%m-%dT%H:%M:%S")
         nfe.nfe40_cNF = "06277716"
-        nfe.with_context(lang="pt_BR")._document_export()
+        nfe.company_id.country_id.name = "Brasil"
+        nfe._document_export()
 
     def serialize_xml(self, nfe_data):
-        for nfe in self.nfe_list:
-            nfe = nfe_data["nfe"]
-            xml_path = os.path.join(
-                l10n_br_nfe.__path__[0],
-                "tests",
-                "nfe",
-                "v4_00",
-                "leiauteNFe",
-                nfe_data["xml_file"],
-            )
-            output = os.path.join(
-                config["data_dir"],
-                "filestore",
-                self.cr.dbname,
-                nfe.send_file_id.store_fname,
-            )
-            _logger.info("XML file saved at %s" % (output,))
-            nfe.company_id.country_id.name = "Brazil"  # clean mess
-            diff = main.diff_files(output, xml_path)
-            return diff
+        nfe = nfe_data["nfe"]
+        xml_path = os.path.join(
+            l10n_br_nfe.__path__[0],
+            "tests",
+            "nfe",
+            "v4_00",
+            "leiauteNFe",
+            nfe_data["xml_file"],
+        )
+        output = os.path.join(
+            config["data_dir"],
+            "filestore",
+            self.cr.dbname,
+            nfe.send_file_id.store_fname,
+        )
+        _logger.info("XML file saved at %s" % (output,))
+        diff = main.diff_files(output, xml_path)
+        return diff

From 31f6c7a4b0da6d388ffa29637bb99e91a718ac7b Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Wed, 19 Jul 2023 11:07:39 -0300
Subject: [PATCH 05/25] [ADD] l10n_br_purchase on import documents

---
 l10n_br_nfe/__manifest__.py                   |  1 +
 l10n_br_nfe/tests/test_nfe_import.py          |  2 +-
 l10n_br_nfe/tests/test_nfe_import_wizard.py   | 28 +++++--
 l10n_br_nfe/wizards/import_document.py        | 77 +++++++++++++++++++
 l10n_br_nfe/wizards/import_document.xml       | 13 ++++
 l10n_br_purchase/__manifest__.py              |  1 +
 l10n_br_purchase/models/__init__.py           |  2 +
 l10n_br_purchase/models/document.py           | 24 ++++++
 .../models/document_fiscal_mixin_methods.py   | 20 +++++
 l10n_br_purchase/models/purchase_order.py     | 24 +++---
 .../models/purchase_order_line.py             |  4 +
 .../tests/test_l10n_br_purchase.py            | 35 +++++++++
 l10n_br_purchase/views/document_view.xml      | 27 +++++++
 l10n_br_purchase/views/purchase_view.xml      | 22 ++++++
 14 files changed, 264 insertions(+), 16 deletions(-)
 create mode 100644 l10n_br_purchase/models/document.py
 create mode 100644 l10n_br_purchase/models/document_fiscal_mixin_methods.py
 create mode 100644 l10n_br_purchase/views/document_view.xml

diff --git a/l10n_br_nfe/__manifest__.py b/l10n_br_nfe/__manifest__.py
index 5a0562f9d8a8..387e17341955 100644
--- a/l10n_br_nfe/__manifest__.py
+++ b/l10n_br_nfe/__manifest__.py
@@ -16,6 +16,7 @@
         "l10n_br_fiscal",
         "l10n_br_fiscal_certificate",
         "l10n_br_nfe_spec",
+        "l10n_br_purchase",
         "spec_driven_model",
         "l10n_br_fiscal_dfe",
     ],
diff --git a/l10n_br_nfe/tests/test_nfe_import.py b/l10n_br_nfe/tests/test_nfe_import.py
index 0130c9fca078..ee8d4b2a0ad5 100644
--- a/l10n_br_nfe/tests/test_nfe_import.py
+++ b/l10n_br_nfe/tests/test_nfe_import.py
@@ -85,7 +85,7 @@ def _check_nfe(self, nfe):
         self.assertEqual(nfe.partner_id.city_id.name, "São João da Boa Vista")
 
         # now we check that company_id is unchanged
-        self.assertEqual(nfe.company_id.name, "Sua Empresa")
+        self.assertEqual(nfe.company_id, self.env.ref("base.main_company"))
 
         # this tests that value is not overrident by stacked default vals
         self.assertEqual(nfe.nfe40_modFrete, "0")  # (default is 9)
diff --git a/l10n_br_nfe/tests/test_nfe_import_wizard.py b/l10n_br_nfe/tests/test_nfe_import_wizard.py
index 39fcc35376a5..f63521322322 100644
--- a/l10n_br_nfe/tests/test_nfe_import_wizard.py
+++ b/l10n_br_nfe/tests/test_nfe_import_wizard.py
@@ -73,6 +73,8 @@ def test_import_nfe_xml(self):
         self._prepare_wizard(self.xml_1)
         self.wizard.import_xml()
 
+        self.check_edoc(self.wizard.document_id)
+
         first_imported_product = self.wizard.imported_products_ids[0]
 
         self.assertEqual(
@@ -99,20 +101,16 @@ def test_import_nfe_xml(self):
         self.assertEqual(first_imported_product.price_unit_trib, 14)
         self.assertEqual(first_imported_product.total, 14)
 
-    def test_import_xml(self):
-        self._prepare_wizard(self.xml_1)
-        self.wizard.import_xml()
-
-        self.check_edoc(self.wizard.document_id)
-
     def test_create_edoc_from_xml(self):
         self._prepare_wizard(self.xml_1)
+        self.wizard.purchase_link_type = "create"
 
         self.wizard.partner_id = False
         edoc = self.wizard.create_edoc_from_xml()
         self.assertEqual(self.wizard.partner_id, edoc.partner_id)
 
         self.check_edoc(edoc)
+        self.assertIn(self.wizard.purchase_id, edoc.linked_purchase_ids)
 
     def test_set_fiscal_operation_type(self):
         self._prepare_wizard(self.xml_1)
@@ -232,3 +230,21 @@ def test_parse_xml(self):
         self.assertEqual(taxes["vICMS"], 100)
         self.assertEqual(taxes["pIPI"], 5)
         self.assertEqual(taxes["vIPI"], 100)
+
+    def test_onchange_cnpj(self):
+        self._prepare_wizard(self.xml_1)
+
+        self.env["purchase.order"].create(
+            {"partner_id": self.env.ref("l10n_br_base.lucro_presumido_partner").id}
+        )
+        self.env["purchase.order"].create(
+            {"partner_id": self.env.ref("l10n_br_base.lucro_presumido_partner").id}
+        )
+        domain = self.wizard._onchange_partner_cpf_cnpj()
+
+        self.assertTrue(domain["domain"])
+        self.assertTrue(domain["domain"]["purchase_id"])
+
+        self.wizard.xml_partner_cpf_cnpj = False
+        domain = self.wizard._onchange_partner_cpf_cnpj()
+        self.assertIsNone(domain)
diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
index de3b9a209731..32e5bb79bd45 100644
--- a/l10n_br_nfe/wizards/import_document.py
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -5,6 +5,7 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
 import base64
+from datetime import datetime
 
 from erpbrasil.base.fiscal.edoc import detectar_chave_edoc
 from nfelib.nfe.bindings.v4_0.leiaute_nfe_v4_00 import TnfeProc
@@ -32,6 +33,20 @@ class NfeImport(models.TransientModel):
 
     nat_op = fields.Char(string="Natureza da Operação")
 
+    purchase_link_type = fields.Selection(
+        selection=[
+            ("choose", "Choose"),
+            ("create", "Create"),
+        ],
+        default="choose",
+        string="Purchase Link Type",
+    )
+
+    purchase_id = fields.Many2one(
+        comodel_name="purchase.order",
+        string="Purchase Order",
+    )
+
     @api.onchange("xml")
     def _onchange_xml(self):
         if self.xml:
@@ -40,6 +55,22 @@ def _onchange_xml(self):
             if self.partner_id:
                 self.imported_products_ids._set_product_supplierinfo_data()
 
+    @api.onchange("xml_partner_cpf_cnpj")
+    def _onchange_partner_cpf_cnpj(self):
+        if not self.xml_partner_cpf_cnpj:
+            return
+
+        supplier_id = self.env["res.partner"].search(
+            [("cnpj_cpf", "=", self.xml_partner_cpf_cnpj)]
+        )
+        purchase_order_ids = self.env["purchase.order"].search(
+            [
+                ("partner_id", "=", supplier_id.id),
+                ("state", "not in", ["done", "cancel"]),
+            ]
+        )
+        return {"domain": {"purchase_id": [("id", "in", purchase_order_ids.ids)]}}
+
     def set_fields_by_xml_data(self):
         parsed_xml = self.parse_xml()
         infNFe = parsed_xml.NFe.infNFe
@@ -182,6 +213,13 @@ def create_edoc_from_xml(self):
         self._attach_original_nfe_xml_to_document(edoc)
         self.imported_products_ids._find_or_create_product_supplierinfo()
 
+        if not self.purchase_id and self.purchase_link_type == "create":
+            self.purchase_id = self.create_purchase_order(edoc)
+
+        if self.purchase_id:
+            self.purchase_id.button_confirm()
+            edoc.linked_purchase_ids = [(4, self.purchase_id.id)]
+
         return edoc
 
     def set_fiscal_operation_type(self):
@@ -192,6 +230,45 @@ def set_fiscal_operation_type(self):
         else:
             self.fiscal_operation_type = "in"
 
+    def create_purchase_order(self, document):
+        purchase = self.env["purchase.order"].create(
+            {
+                "partner_id": document.partner_id.id,
+                "currency_id": self.company_id.currency_id.id,
+                "fiscal_operation_id": self.get_purchase_fiscal_operation_id(),
+                "date_order": datetime.now(),
+                "origin_document_id": document.id,
+                "imported": True,
+            }
+        )
+
+        purchase_lines = []
+        for line in document.fiscal_line_ids:
+            product_uom = line.uom_id or line.product_id.uom_id
+            purchase_line = self.env["purchase.order.line"].create(
+                {
+                    "product_id": line.product_id.id,
+                    "origin_document_line_id": line.id,
+                    "name": line.product_id.display_name,
+                    "date_planned": datetime.now(),
+                    "product_qty": line.quantity,
+                    "product_uom": product_uom.id,
+                    "price_unit": line.price_unit,
+                    "price_subtotal": line.amount_total,
+                    "order_id": purchase.id,
+                }
+            )
+            purchase_lines.append(purchase_line.id)
+        purchase.write({"order_line": [(6, 0, purchase_lines)]})
+        return purchase
+
+    def get_purchase_fiscal_operation_id(self):
+        default_fiscal_operation_id = self.env.ref("l10n_br_fiscal.fo_compras").id
+        return (
+            self.env.user.company_id.purchase_fiscal_operation_id.id
+            or default_fiscal_operation_id
+        )
+
     def _attach_original_nfe_xml_to_document(self, edoc):
         return self.env["ir.attachment"].create(
             {
diff --git a/l10n_br_nfe/wizards/import_document.xml b/l10n_br_nfe/wizards/import_document.xml
index 01029d60a4f0..0b55dfcc3106 100644
--- a/l10n_br_nfe/wizards/import_document.xml
+++ b/l10n_br_nfe/wizards/import_document.xml
@@ -22,6 +22,19 @@
             </xpath>
 
             <xpath expr="//group[@id='document_info']" position="after">
+                <separator
+                    string="Purchase Order"
+                    attrs="{'invisible': [('xml', '=', False)]}"
+                />
+                <group attrs="{'invisible': [('xml', '=', False)]}">
+                    <group>
+                        <field name="purchase_link_type" />
+                        <field
+                            name="purchase_id"
+                            attrs="{'invisible': [('purchase_link_type', '!=', 'choose')]}"
+                        />
+                    </group>
+                </group>
                 <separator
                     string="NFe XML Products"
                     attrs="{'invisible': [('xml', '=', False)]}"
diff --git a/l10n_br_purchase/__manifest__.py b/l10n_br_purchase/__manifest__.py
index 7bd28310a699..adc531a628fe 100644
--- a/l10n_br_purchase/__manifest__.py
+++ b/l10n_br_purchase/__manifest__.py
@@ -18,6 +18,7 @@
         # View
         "views/purchase_view.xml",
         "views/res_company_view.xml",
+        "views/document_view.xml",
         # Reports
         "reports/purchase_report_views.xml",
         "reports/purchase_order_templates.xml",
diff --git a/l10n_br_purchase/models/__init__.py b/l10n_br_purchase/models/__init__.py
index 761f6410c535..9a892ffedc67 100644
--- a/l10n_br_purchase/models/__init__.py
+++ b/l10n_br_purchase/models/__init__.py
@@ -5,3 +5,5 @@
 from . import purchase_order
 from . import purchase_order_line
 from . import account_move
+from . import document_fiscal_mixin_methods
+from . import document
diff --git a/l10n_br_purchase/models/document.py b/l10n_br_purchase/models/document.py
new file mode 100644
index 000000000000..7dc2d833915c
--- /dev/null
+++ b/l10n_br_purchase/models/document.py
@@ -0,0 +1,24 @@
+# Copyright 2023 KMEE (Felipe Zago Rodrigues <felipe.zago@kmee.com.br>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FiscalDocument(models.Model):
+    _inherit = "l10n_br_fiscal.document"
+
+    linked_purchase_ids = fields.Many2many(
+        comodel_name="purchase.order",
+        relation="fiscal_document_purchase_rel_1",
+        column1="document_id",
+        column2="purchase_id",
+        string="Ordens de Compra",
+        copy=False,
+    )
+
+    linked_purchase_count = fields.Integer(compute="_compute_linked_purchase_count")
+
+    @api.depends("linked_purchase_ids")
+    def _compute_linked_purchase_count(self):
+        for rec in self:
+            rec.linked_purchase_count = len(rec.linked_purchase_ids)
diff --git a/l10n_br_purchase/models/document_fiscal_mixin_methods.py b/l10n_br_purchase/models/document_fiscal_mixin_methods.py
new file mode 100644
index 000000000000..4244eb3592ef
--- /dev/null
+++ b/l10n_br_purchase/models/document_fiscal_mixin_methods.py
@@ -0,0 +1,20 @@
+# Copyright 2023 KMEE (Felipe Zago Rodrigues <felipe.zago@kmee.com.br>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class FiscalDocumentMixinMethods(models.AbstractModel):
+    _inherit = "l10n_br_fiscal.document.mixin.methods"
+
+    def action_open_purchase(self):
+        result = self.env.ref("l10n_br_purchase.action_purchase_tree_all").read()[0]
+        purchase_ids = self.mapped("linked_purchase_ids")
+
+        if len(purchase_ids) == 1:
+            result = self.env.ref("l10n_br_purchase.action_purchase_form_all").read()[0]
+            result["res_id"] = purchase_ids[0].id
+        else:
+            result["domain"] = "[('id', 'in', %s)]" % (purchase_ids.ids)
+
+        return result
diff --git a/l10n_br_purchase/models/purchase_order.py b/l10n_br_purchase/models/purchase_order.py
index f761f68c3c54..0b6b2a842179 100644
--- a/l10n_br_purchase/models/purchase_order.py
+++ b/l10n_br_purchase/models/purchase_order.py
@@ -53,6 +53,10 @@ def _fiscal_operation_domain(self):
         string="Comments",
     )
 
+    imported = fields.Boolean(string="Imported")
+
+    origin_document_id = fields.Many2one(comodel_name="l10n_br_fiscal.document")
+
     @api.model
     def fields_view_get(
         self, view_id=None, view_type="form", toolbar=False, submenu=False
@@ -99,12 +103,14 @@ def _amount_all(self):
 
     def _prepare_invoice(self):
         self.ensure_one()
-        invoice_vals = super()._prepare_invoice()
-        invoice_vals.update(
-            {
-                "ind_final": self.ind_final,
-                "fiscal_operation_id": self.fiscal_operation_id.id,
-                "document_type_id": self.company_id.document_type_id.id,
-            }
-        )
-        return invoice_vals
+
+        return {
+            **super()._prepare_invoice(),
+            "ind_final": self.ind_final,
+            "fiscal_operation_id": self.fiscal_operation_id.id,
+            "fiscal_document_id": self.origin_document_id.id,
+            "document_type_id": (
+                self.origin_document_id.document_type_id.id
+                or self.company_id.document_type_id.id
+            ),
+        }
diff --git a/l10n_br_purchase/models/purchase_order_line.py b/l10n_br_purchase/models/purchase_order_line.py
index 04bc92abb1ff..8b0ac69416a0 100644
--- a/l10n_br_purchase/models/purchase_order_line.py
+++ b/l10n_br_purchase/models/purchase_order_line.py
@@ -79,6 +79,10 @@ def _fiscal_operation_domain(self):
         related="company_id.delivery_costs",
     )
 
+    origin_document_line_id = fields.Many2one(
+        comodel_name="l10n_br_fiscal.document.line"
+    )
+
     @api.depends(
         "product_uom_qty",
         "price_unit",
diff --git a/l10n_br_purchase/tests/test_l10n_br_purchase.py b/l10n_br_purchase/tests/test_l10n_br_purchase.py
index 62ee2b3ab2e8..fdb2dfa79e6b 100644
--- a/l10n_br_purchase/tests/test_l10n_br_purchase.py
+++ b/l10n_br_purchase/tests/test_l10n_br_purchase.py
@@ -149,6 +149,25 @@ def setUpClass(cls):
             },
         }
 
+        cls.product_1 = cls.env["product.product"].create(
+            {
+                "name": "PRODUCT TEST 1",
+                "list_price": 10,
+                "uom_id": cls.env.ref("uom.product_uom_unit").id,
+            }
+        )
+        cls.nfe_fiscal_document = cls.env["l10n_br_fiscal.document"].create(
+            {
+                "document_type_id": cls.env.ref(
+                    "l10n_br_fiscal.document_55_serie_1"
+                ).id,
+                "fiscal_operation_type": "out",
+                "fiscal_line_ids": [
+                    (0, 0, {"name": "LINE TEST 1", "product_id": cls.product_1.id})
+                ],
+            }
+        )
+
     def _change_user_company(self, company):
         self.env.user.company_ids += company
         self.env.user.company_id = company
@@ -165,6 +184,7 @@ def _run_purchase_line_onchanges(self, purchase_line):
         purchase_line._onchange_fiscal_tax_ids()
 
     def _invoice_purchase_order(self, order):
+        order.origin_document_id = self.nfe_fiscal_document.id
         order.with_context(tracking_disable=True).button_confirm()
 
         invoice_values = {
@@ -175,6 +195,21 @@ def _invoice_purchase_order(self, order):
         invoice_values.update(order._prepare_br_fiscal_dict())
         document_type_id = order._context.get("document_type_id")
 
+        invoice_values.update(order._prepare_invoice())
+        self.assertEqual(
+            invoice_values["fiscal_document_id"], self.nfe_fiscal_document.id
+        )
+
+        self.nfe_fiscal_document.linked_purchase_ids = [(4, order.id)]
+        action = self.nfe_fiscal_document.action_open_purchase()
+        self.assertEqual(action["res_id"], order.id)
+
+        self.nfe_fiscal_document.linked_purchase_ids = [(4, order.copy().id)]
+        action = self.nfe_fiscal_document.action_open_purchase()
+        self.assertIn("domain", action)
+
+        self.assertEqual(self.nfe_fiscal_document.linked_purchase_count, 2)
+
         if document_type_id:
             document_type = self.env["l10n_br_fiscal.document.type"].browse(
                 document_type_id
diff --git a/l10n_br_purchase/views/document_view.xml b/l10n_br_purchase/views/document_view.xml
new file mode 100644
index 000000000000..e0222abecd08
--- /dev/null
+++ b/l10n_br_purchase/views/document_view.xml
@@ -0,0 +1,27 @@
+<odoo>
+    <record id="l10n_br_purchase_document_form" model="ir.ui.view">
+        <field
+            name="name"
+        >l10n_br_nfe.fiscal.purchase.document.form (in l10n_br_purchase)</field>
+        <field name="model">l10n_br_fiscal.document</field>
+        <field name="inherit_id" ref="l10n_br_fiscal.document_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <field name="linked_purchase_ids" invisible="1" />
+                <button
+                    type="object"
+                    name="action_open_purchase"
+                    class="oe_stat_button"
+                    icon="fa-folder-open"
+                    attrs="{'invisible':[('linked_purchase_ids', '=', [])]}"
+                >
+                    <field
+                        name="linked_purchase_count"
+                        widget="statinfo"
+                        string="Purchase Orders"
+                    />
+                </button>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/l10n_br_purchase/views/purchase_view.xml b/l10n_br_purchase/views/purchase_view.xml
index bebdaa193f5b..cab5719cbeb8 100644
--- a/l10n_br_purchase/views/purchase_view.xml
+++ b/l10n_br_purchase/views/purchase_view.xml
@@ -157,6 +157,13 @@
                     options="{'currency_field': 'currency_id'}"
                 />
               </xpath>
+              <xpath expr="//group[@name='other_info']" position="inside">
+                  <field name="imported" readonly="1" />
+                  <field
+                    name="origin_document_id"
+                    attrs="{'invisible': [('imported', '=', False)]}"
+                />
+              </xpath>
           </field>
       </record>
 
@@ -173,4 +180,19 @@
           </field>
       </record>
 
+    <record id="action_purchase_tree_all" model="ir.actions.act_window">
+        <field name="name">Purchases</field>
+        <field name="res_model">purchase.order</field>
+        <field name="type">form</field>
+        <field name="view_mode">tree,kanban,form</field>
+        <field name="view_id" ref="purchase.purchase_order_tree" />
+    </record>
+
+    <record id="action_purchase_form_all" model="ir.actions.act_window">
+        <field name="name">Purchase</field>
+        <field name="res_model">purchase.order</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="purchase.purchase_order_form" />
+    </record>
+
 </odoo>

From 2cb9d6629702c3eb73ac69e66bb3f0bc40e6a8b3 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Wed, 19 Jul 2023 18:11:24 -0300
Subject: [PATCH 06/25] [ADD] treatment when xml document to import already
 exists

---
 l10n_br_nfe/wizards/import_document.py  | 54 +++++++++++++++++--------
 l10n_br_nfe/wizards/import_document.xml | 48 +++++++++++++---------
 2 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
index 32e5bb79bd45..498979c20895 100644
--- a/l10n_br_nfe/wizards/import_document.py
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -52,30 +52,31 @@ def _onchange_xml(self):
         if self.xml:
             self.set_fields_by_xml_data()
 
-            if self.partner_id:
-                self.imported_products_ids._set_product_supplierinfo_data()
-
     @api.onchange("xml_partner_cpf_cnpj")
     def _onchange_partner_cpf_cnpj(self):
         if not self.xml_partner_cpf_cnpj:
             return
 
+        purchase_order_ids = self.get_purchase_orders_from_xml_supplier()
+        return {"domain": {"purchase_id": [("id", "in", purchase_order_ids.ids)]}}
+
+    def get_purchase_orders_from_xml_supplier(self):
         supplier_id = self.env["res.partner"].search(
             [("cnpj_cpf", "=", self.xml_partner_cpf_cnpj)]
         )
-        purchase_order_ids = self.env["purchase.order"].search(
+        return self.env["purchase.order"].search(
             [
                 ("partner_id", "=", supplier_id.id),
                 ("state", "not in", ["done", "cancel"]),
             ]
         )
-        return {"domain": {"purchase_id": [("id", "in", purchase_order_ids.ids)]}}
 
     def set_fields_by_xml_data(self):
         parsed_xml = self.parse_xml()
-        infNFe = parsed_xml.NFe.infNFe
         document = self.get_document_by_xml(parsed_xml)
+        infNFe = parsed_xml.NFe.infNFe
 
+        self.find_existing_document()
         self.check_xml_data(parsed_xml)
         self.document_key = document.chave
         self.document_number = int(document.numero_documento)
@@ -91,7 +92,7 @@ def set_fields_by_xml_data(self):
             limit=1,
         )
         self.nat_op = infNFe.ide.natOp
-        self._create_imported_products_by_xml(parsed_xml)
+        self.create_imported_products_by_xml()
 
     def parse_xml(self):
         try:
@@ -116,7 +117,8 @@ def check_xml_data(self, xml):
                 )
             )
 
-    def _create_imported_products_by_xml(self, xml):
+    def create_imported_products_by_xml(self):
+        xml = self.parse_xml()
         product_ids = []
         for product in xml.NFe.infNFe.det:
             product_ids.append(
@@ -127,6 +129,9 @@ def _create_imported_products_by_xml(self, xml):
 
         self.imported_products_ids = [(6, 0, product_ids)]
 
+        if self.partner_id:
+            self.imported_products_ids._set_product_supplierinfo_data()
+
     def _prepare_imported_product_values(self, product):
         taxes = self._get_taxes_from_xml_product(product)
         uom_id = self.env["uom.uom"].search([("code", "=", product.prod.uCom)], limit=1)
@@ -188,16 +193,21 @@ def _get_taxes_from_xml_product(self, product):
         return {"vICMS": vICMS, "pICMS": pICMS, "vIPI": vIPI, "pIPI": pIPI}
 
     def import_xml(self):
-        self.document_id = self.create_edoc_from_xml()
+        self.find_existing_document()
+        if not self.document_id:
+            self.document_id = self.create_edoc_from_xml()
 
-        return {
-            "name": _("Document Imported"),
-            "type": "ir.actions.act_window",
-            "target": "current",
-            "views": [[False, "form"]],
-            "res_id": self.document_id.id,
-            "res_model": "l10n_br_fiscal.document",
-        }
+        return self.action_open_document()
+
+    def find_existing_document(self):
+        document = self.get_document_by_xml(self.parse_xml())
+        self.document_id = self.env["l10n_br_fiscal.document"].search(
+            [
+                ("document_key", "=", document.chave),
+                ("company_id", "=", self.company_id.id),
+            ],
+            limit=1,
+        )
 
     def create_edoc_from_xml(self):
         self.set_fiscal_operation_type()
@@ -293,6 +303,16 @@ def _edit_parsed_xml(self, parsed_xml):
                     xml_product.prod.CFOP = product_line.new_cfop_id.code
         return parsed_xml
 
+    def action_open_document(self):
+        return {
+            "name": _("Document Imported"),
+            "type": "ir.actions.act_window",
+            "target": "current",
+            "views": [[False, "form"]],
+            "res_id": self.document_id.id,
+            "res_model": "l10n_br_fiscal.document",
+        }
+
 
 class NfeImportProducts(models.TransientModel):
     _name = "l10n_br_nfe.import_xml.products"
diff --git a/l10n_br_nfe/wizards/import_document.xml b/l10n_br_nfe/wizards/import_document.xml
index 0b55dfcc3106..8fecd420eaba 100644
--- a/l10n_br_nfe/wizards/import_document.xml
+++ b/l10n_br_nfe/wizards/import_document.xml
@@ -22,28 +22,38 @@
             </xpath>
 
             <xpath expr="//group[@id='document_info']" position="after">
-                <separator
-                    string="Purchase Order"
-                    attrs="{'invisible': [('xml', '=', False)]}"
-                />
-                <group attrs="{'invisible': [('xml', '=', False)]}">
-                    <group>
-                        <field name="purchase_link_type" />
-                        <field
-                            name="purchase_id"
-                            attrs="{'invisible': [('purchase_link_type', '!=', 'choose')]}"
-                        />
-                    </group>
+                <group attrs="{'invisible': [('document_id', '=', False)]}">
+                    <field name="document_id" readonly="1" string="Existing Document" />
                 </group>
-                <separator
-                    string="NFe XML Products"
-                    attrs="{'invisible': [('xml', '=', False)]}"
-                />
+
                 <group
-                    id="imported_products"
-                    attrs="{'invisible': [('xml', '=', False)]}"
+                    col="4"
+                    attrs="{
+                    'invisible': [
+                        '|',
+                        ('xml', '=', False),
+                        ('document_id', '!=', False),
+                    ]
+                }"
                 >
-                    <field name="imported_products_ids" nolabel="1" />
+                    <separator string="Purchase Order" colspan="4" />
+                    <group colspan="4">
+                        <group>
+                            <field name="purchase_link_type" />
+                            <field
+                                name="purchase_id"
+                                attrs="{'invisible': [('purchase_link_type', '!=', 'choose')]}"
+                            />
+                        </group>
+                    </group>
+                    <separator string="NFe XML Products" colspan="4" />
+                    <group
+                        colspan="4"
+                        id="imported_products"
+                        attrs="{'invisible': [('xml', '=', False)]}"
+                    >
+                        <field name="imported_products_ids" nolabel="1" />
+                    </group>
                 </group>
             </xpath>
 

From 1eefc468c010a286624059ae432f8c93151f31a5 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Thu, 20 Jul 2023 14:44:48 -0300
Subject: [PATCH 07/25] [FIX] import bug and improve code

---
 l10n_br_nfe/models/product_supplierinfo.py  |  2 +-
 l10n_br_nfe/tests/test_nfe_import_wizard.py | 10 +++----
 l10n_br_nfe/wizards/import_document.py      | 31 +++++++++++++--------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/l10n_br_nfe/models/product_supplierinfo.py b/l10n_br_nfe/models/product_supplierinfo.py
index 21ff712bfdf8..83b0207e57ae 100644
--- a/l10n_br_nfe/models/product_supplierinfo.py
+++ b/l10n_br_nfe/models/product_supplierinfo.py
@@ -7,7 +7,7 @@
 class SupplierInfo(models.Model):
     _inherit = "product.supplierinfo"
 
-    partner_uom = fields.Many2one(
+    partner_uom_id = fields.Many2one(
         "uom.uom",
         "Partner Unit of Measure",
         help="This comes from the last imported document.",
diff --git a/l10n_br_nfe/tests/test_nfe_import_wizard.py b/l10n_br_nfe/tests/test_nfe_import_wizard.py
index f63521322322..581593e55495 100644
--- a/l10n_br_nfe/tests/test_nfe_import_wizard.py
+++ b/l10n_br_nfe/tests/test_nfe_import_wizard.py
@@ -154,7 +154,7 @@ def test_imported_products(self):
             {
                 "product_id": self.product_1.id,
                 "name": self.partner_1.id,
-                "partner_uom": self.env["uom.uom"].search([], limit=1).id,
+                "partner_uom_id": self.env["uom.uom"].search([], limit=1).id,
                 "price": 100,
             }
         )
@@ -168,7 +168,7 @@ def test_imported_products(self):
 
         first_product._find_or_create_product_supplierinfo()
         self.assertEqual(wiz_supplier_id.product_id, first_product.product_id)
-        self.assertEqual(wiz_supplier_id.partner_uom, first_product.uom_internal)
+        self.assertEqual(wiz_supplier_id.partner_uom_id, first_product.uom_internal)
         self.assertEqual(wiz_supplier_id.product_code, first_product.product_code)
         self.assertEqual(wiz_supplier_id.product_name, first_product.product_name)
 
@@ -178,7 +178,7 @@ def test_match_xml_product(self):
         xml = self.wizard.parse_xml()
         xml_product_1 = xml.NFe.infNFe.det[0].prod
         prod_id = self.wizard._match_product(xml_product_1)
-        self.assertEqual(prod_id, self.env.ref("product.product_product_10").id)
+        self.assertEqual(prod_id, self.env.ref("product.product_product_10"))
 
         prod_code = self.env["product.product"].create(
             {
@@ -194,7 +194,7 @@ def test_match_xml_product(self):
         mock_code = MagicMock(spec=["cProd"])
         mock_code.cProd = "TEST123"
         prod_id = self.wizard._match_product(mock_code)
-        self.assertEqual(prod_id, prod_code.id)
+        self.assertEqual(prod_id, prod_code)
 
         prod_code.unlink()
         prod_barcode = self.env["product.product"].create(
@@ -203,7 +203,7 @@ def test_match_xml_product(self):
         mock_barcode = MagicMock(spec=["cEANTrib"])
         mock_barcode.cEANTrib = "123456789123"
         prod_id = self.wizard._match_product(mock_barcode)
-        self.assertEqual(prod_id, prod_barcode.id)
+        self.assertEqual(prod_id, prod_barcode)
 
         prod_barcode.unlink()
         prod_id = self.wizard._match_product(MagicMock())
diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
index 498979c20895..22a9a780599e 100644
--- a/l10n_br_nfe/wizards/import_document.py
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -134,14 +134,20 @@ def create_imported_products_by_xml(self):
 
     def _prepare_imported_product_values(self, product):
         taxes = self._get_taxes_from_xml_product(product)
-        uom_id = self.env["uom.uom"].search([("code", "=", product.prod.uCom)], limit=1)
+        product_id = self._match_product(product.prod)
+        if product_id:
+            uom_id = product_id.uom_id
+        else:
+            uom_id = self.env["uom.uom"].search(
+                [("code", "=", product.prod.uCom)], limit=1
+            )
 
         return {
             "product_name": product.prod.xProd,
             "product_code": product.prod.cProd,
             "ncm_xml": product.prod.NCM,
             "cfop_xml": product.prod.CFOP,
-            "product_id": self._match_product(product.prod),
+            "product_id": product_id.id,
             "icms_percent": taxes["pICMS"],
             "icms_value": taxes["vICMS"],
             "ipi_percent": taxes["pIPI"],
@@ -167,7 +173,7 @@ def _match_product(self, xml_product):
 
         rec_id = False
         if domain:
-            rec_id = self.env["product.product"].search(domain, limit=1).id
+            rec_id = self.env["product.product"].search(domain, limit=1)
         return rec_id
 
     def _get_taxes_from_xml_product(self, product):
@@ -294,13 +300,14 @@ def _edit_parsed_xml(self, parsed_xml):
         for product_line in self.imported_products_ids.filtered("product_id"):
             internal_product = product_line.product_id
             for xml_product in parsed_xml.NFe.infNFe.det:
-                xml_product.prod.xProd = internal_product.name
-                xml_product.prod.cProd = internal_product.default_code
-                xml_product.prod.cEAN = internal_product.barcode or "SEM GTIN"
-                xml_product.prod.cEANTrib = internal_product.barcode or "SEM GTIN"
-                xml_product.prod.uCom = product_line.uom_internal.code
-                if product_line.new_cfop_id:
-                    xml_product.prod.CFOP = product_line.new_cfop_id.code
+                if xml_product.prod.cProd == product_line.product_code:
+                    xml_product.prod.xProd = internal_product.name
+                    xml_product.prod.cProd = internal_product.default_code
+                    xml_product.prod.cEAN = internal_product.barcode or "SEM GTIN"
+                    xml_product.prod.cEANTrib = internal_product.barcode or "SEM GTIN"
+                    xml_product.prod.uCom = product_line.uom_internal.code
+                    if product_line.new_cfop_id:
+                        xml_product.prod.CFOP = product_line.new_cfop_id.code
         return parsed_xml
 
     def action_open_document(self):
@@ -348,7 +355,7 @@ class NfeImportProducts(models.TransientModel):
     )
 
     uom_internal = fields.Many2one(
-        related="product_supplier_id.partner_uom",
+        comodel_name="uom.uom",
         help="Internal UoM, equivalent to the comercial one in the document",
     )
 
@@ -426,6 +433,7 @@ def _create_product_supplier(self):
                 "product_code": self.product_code,
                 "price": self.product_id.lst_price,
                 "name": self.imported_partner_id.id,
+                "partner_uom_id": self.uom_internal.id,
             }
         )
         self.product_id.write({"seller_ids": [(4, self.product_supplier_id.id)]})
@@ -439,5 +447,6 @@ def _update_product_supplier(self):
                 "price": self.uom_internal._compute_price(
                     self.price_unit_com, self.product_id.uom_id
                 ),
+                "partner_uom_id": self.uom_internal.id,
             }
         )

From a1572020219b83ae00b856569cdbacfe0d245782 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Fri, 21 Jul 2023 15:33:24 -0300
Subject: [PATCH 08/25] [FIX] product_id False on import

---
 l10n_br_nfe/wizards/import_document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
index 22a9a780599e..1995d8c17d6a 100644
--- a/l10n_br_nfe/wizards/import_document.py
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -147,7 +147,7 @@ def _prepare_imported_product_values(self, product):
             "product_code": product.prod.cProd,
             "ncm_xml": product.prod.NCM,
             "cfop_xml": product.prod.CFOP,
-            "product_id": product_id.id,
+            "product_id": product_id and product_id.id or False,
             "icms_percent": taxes["pICMS"],
             "icms_value": taxes["vICMS"],
             "ipi_percent": taxes["pIPI"],

From de9af42f29c9b4a37ad564bf3f28cf036a72f507 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Mon, 7 Aug 2023 17:29:01 -0300
Subject: [PATCH 09/25] [FIX] nfelib type validation on spec import attribute
 building

---
 spec_driven_model/models/spec_import.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec_driven_model/models/spec_import.py b/spec_driven_model/models/spec_import.py
index c1b645357172..77fe3ff4f203 100644
--- a/spec_driven_model/models/spec_import.py
+++ b/spec_driven_model/models/spec_import.py
@@ -128,15 +128,7 @@ def _build_attr(self, node, fields, vals, path, attr):
             comodel = self.get_concrete_model(comodel_name)
             if comodel is None:  # example skip ICMS100 class
                 return
-            if not str(attr[1].type).startswith("typing.List"):
-                # m2o
-                new_value = comodel.build_attrs(value, path=child_path)
-                child_defaults = self._extract_related_values(vals, key)
-
-                new_value.update(child_defaults)
-                # FIXME comodel._build_many2one
-                self._build_many2one(comodel, vals, new_value, key, value, child_path)
-            else:
+            if str(attr[1].type).startswith("typing.List"):
                 # o2m
                 lines = []
                 for line in [li for li in value if li]:
@@ -145,6 +137,14 @@ def _build_attr(self, node, fields, vals, path, attr):
                     )
                     lines.append((0, 0, line_vals))
                 vals[key] = lines
+            else:
+                # m2o
+                new_value = comodel.build_attrs(value, path=child_path)
+                child_defaults = self._extract_related_values(vals, key)
+
+                new_value.update(child_defaults)
+                # FIXME comodel._build_many2one
+                self._build_many2one(comodel, vals, new_value, key, value, child_path)
 
     @api.model
     def _build_string_not_simple_type(self, key, vals, value, node):

From ecb2a0598847299edbea90c7bf8592237a34bb35 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Tue, 29 Aug 2023 15:22:41 -0300
Subject: [PATCH 10/25] [FIX] erros on import

---
 l10n_br_nfe/tests/test_nfe_import_wizard.py |  1 -
 l10n_br_nfe/wizards/import_document.py      | 15 ++++++++++-----
 l10n_br_nfe/wizards/import_document.xml     |  8 +++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/l10n_br_nfe/tests/test_nfe_import_wizard.py b/l10n_br_nfe/tests/test_nfe_import_wizard.py
index 581593e55495..c9f8fbb07e06 100644
--- a/l10n_br_nfe/tests/test_nfe_import_wizard.py
+++ b/l10n_br_nfe/tests/test_nfe_import_wizard.py
@@ -169,7 +169,6 @@ def test_imported_products(self):
         first_product._find_or_create_product_supplierinfo()
         self.assertEqual(wiz_supplier_id.product_id, first_product.product_id)
         self.assertEqual(wiz_supplier_id.partner_uom_id, first_product.uom_internal)
-        self.assertEqual(wiz_supplier_id.product_code, first_product.product_code)
         self.assertEqual(wiz_supplier_id.product_name, first_product.product_name)
 
     def test_match_xml_product(self):
diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
index 1995d8c17d6a..2418b09160a8 100644
--- a/l10n_br_nfe/wizards/import_document.py
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -302,10 +302,10 @@ def _edit_parsed_xml(self, parsed_xml):
             for xml_product in parsed_xml.NFe.infNFe.det:
                 if xml_product.prod.cProd == product_line.product_code:
                     xml_product.prod.xProd = internal_product.name
-                    xml_product.prod.cProd = internal_product.default_code
                     xml_product.prod.cEAN = internal_product.barcode or "SEM GTIN"
                     xml_product.prod.cEANTrib = internal_product.barcode or "SEM GTIN"
                     xml_product.prod.uCom = product_line.uom_internal.code
+                    xml_product.prod.uTrib = product_line.uom_internal.code
                     if product_line.new_cfop_id:
                         xml_product.prod.CFOP = product_line.new_cfop_id.code
         return parsed_xml
@@ -342,7 +342,7 @@ class NfeImportProducts(models.TransientModel):
 
     import_xml_id = fields.Many2one(comodel_name="l10n_br_nfe.import_xml")
 
-    product_code = fields.Char(string="Partner Product Code")
+    product_code = fields.Char(string="XML Product Code")
 
     product_id = fields.Many2one(
         comodel_name="product.product",
@@ -392,8 +392,6 @@ def _search_product_supplier(self):
         return self.env["product.supplierinfo"].search(
             [
                 ("name", "=", self.imported_partner_id.id),
-                "|",
-                ("product_name", "=", self.product_name),
                 ("product_code", "=", self.product_code),
             ],
             limit=1,
@@ -426,12 +424,19 @@ def _find_or_create_product_supplierinfo(self):
                 product._update_product_supplier()
 
     def _create_product_supplier(self):
+        if self.uom_internal:
+            price = self.uom_internal._compute_price(
+                self.price_unit_com, self.product_id.uom_id
+            )
+        else:
+            price = self.product_id.lst_price
+
         self.product_supplier_id = self.env["product.supplierinfo"].create(
             {
                 "product_id": self.product_id.id,
                 "product_name": self.product_name,
                 "product_code": self.product_code,
-                "price": self.product_id.lst_price,
+                "price": price,
                 "name": self.imported_partner_id.id,
                 "partner_uom_id": self.uom_internal.id,
             }
diff --git a/l10n_br_nfe/wizards/import_document.xml b/l10n_br_nfe/wizards/import_document.xml
index 8fecd420eaba..51000763036b 100644
--- a/l10n_br_nfe/wizards/import_document.xml
+++ b/l10n_br_nfe/wizards/import_document.xml
@@ -81,12 +81,10 @@
                     domain="[('purchase_ok', '=', True)]"
                 />
                 <field name="product_name" readonly="1" />
+                <field name="product_code" readonly="1" />
                 <field name="ncm_xml" readonly="1" />
-                <field name="ncm_internal" />
-                <field
-                    name="uom_internal"
-                    options="{'no_quick_create': True, 'no_create': True}"
-                />
+                <field name="ncm_internal" readonly="1" />
+                <field name="uom_internal" />
                 <field name="cfop_xml" readonly="1" />
                 <field name="new_cfop_id" />
                 <field name="icms_percent" readonly="1" />

From f4756f515aceab12aecd5ccde90d0f78a03b3ab5 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Fri, 1 Sep 2023 09:03:00 -0300
Subject: [PATCH 11/25] [FIX] adapt DFe parse procNFe

---
 l10n_br_nfe/models/dfe.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/l10n_br_nfe/models/dfe.py b/l10n_br_nfe/models/dfe.py
index 7cd4ac94f1fa..f8e6ddbe0b9d 100644
--- a/l10n_br_nfe/models/dfe.py
+++ b/l10n_br_nfe/models/dfe.py
@@ -128,8 +128,4 @@ def import_documents(self):
     @api.model
     def parse_procNFe(self, xml):
         binding = TnfeProc.from_xml(xml.read().decode())
-        return (
-            self.env["nfe.40.infnfe"]
-            .with_context(tracking_disable=True, edoc_type="in", dry_run=False)
-            .build_from_binding(binding.NFe.infNFe)
-        )
+        return self.env["l10n_br_fiscal.document"].import_nfe_xml(binding)

From 33faefb8cf1766ed88040d1988e16f598317e02e Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Fri, 1 Sep 2023 09:04:02 -0300
Subject: [PATCH 12/25] [FIX] company definition on import wizard mixin

---
 l10n_br_fiscal/wizards/document_import_wizard_mixin.py  | 7 +++++--
 l10n_br_fiscal/wizards/document_import_wizard_mixin.xml | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/l10n_br_fiscal/wizards/document_import_wizard_mixin.py b/l10n_br_fiscal/wizards/document_import_wizard_mixin.py
index e05220551bc7..42427006d95d 100644
--- a/l10n_br_fiscal/wizards/document_import_wizard_mixin.py
+++ b/l10n_br_fiscal/wizards/document_import_wizard_mixin.py
@@ -14,11 +14,14 @@ class DocumentImportWizardMixin(models.TransientModel):
     company_id = fields.Many2one(
         comodel_name="res.company",
         string="Company",
-        default=lambda self: self.env.user.company_id,
+        default=lambda self: self.env.company.id,
     )
 
     importing_type = fields.Selection(
-        selection=[("xml_file", "XML File")], string="Importing Type", required=True
+        selection=[("xml_file", "XML File")],
+        string="Importing Type",
+        required=True,
+        default="xml_file",
     )
 
     xml = fields.Binary(string="XML to Import")
diff --git a/l10n_br_fiscal/wizards/document_import_wizard_mixin.xml b/l10n_br_fiscal/wizards/document_import_wizard_mixin.xml
index d8af9e648a29..bcc7bfa5a326 100644
--- a/l10n_br_fiscal/wizards/document_import_wizard_mixin.xml
+++ b/l10n_br_fiscal/wizards/document_import_wizard_mixin.xml
@@ -9,7 +9,6 @@
         <field name="arch" type="xml">
             <form string="Import Document">
                 <group>
-                    <field name="company_id" />
                     <field name="importing_type" />
                     <field
                         name="xml"

From 99a245b223fd45e76b993481cff31352deefb5f1 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Fri, 1 Sep 2023 09:06:17 -0300
Subject: [PATCH 13/25] [ADD] mapping import different UOM categories with
 factor

---
 l10n_br_nfe/__manifest__.py                |  1 +
 l10n_br_nfe/models/product_supplierinfo.py |  7 +-
 l10n_br_nfe/views/supplier_info_view.xml   | 32 ++++++++
 l10n_br_nfe/wizards/import_document.py     | 90 ++++++++++++----------
 l10n_br_nfe/wizards/import_document.xml    |  3 +-
 5 files changed, 90 insertions(+), 43 deletions(-)
 create mode 100644 l10n_br_nfe/views/supplier_info_view.xml

diff --git a/l10n_br_nfe/__manifest__.py b/l10n_br_nfe/__manifest__.py
index 387e17341955..ca996dc0bd2c 100644
--- a/l10n_br_nfe/__manifest__.py
+++ b/l10n_br_nfe/__manifest__.py
@@ -33,6 +33,7 @@
         "views/res_config_settings_view.xml",
         "views/mde/mde_views.xml",
         "views/dfe/dfe_views.xml",
+        "views/supplier_info_view.xml",
         # Report
         "report/reports.xml",
         "report/danfe_nfce.xml",
diff --git a/l10n_br_nfe/models/product_supplierinfo.py b/l10n_br_nfe/models/product_supplierinfo.py
index 83b0207e57ae..a854101db1a6 100644
--- a/l10n_br_nfe/models/product_supplierinfo.py
+++ b/l10n_br_nfe/models/product_supplierinfo.py
@@ -8,7 +8,8 @@ class SupplierInfo(models.Model):
     _inherit = "product.supplierinfo"
 
     partner_uom_id = fields.Many2one(
-        "uom.uom",
-        "Partner Unit of Measure",
-        help="This comes from the last imported document.",
+        comodel_name="uom.uom",
+        string="Partner Unit of Measure",
     )
+
+    partner_uom_factor = fields.Float(string="Partner UOM Factor", default=1)
diff --git a/l10n_br_nfe/views/supplier_info_view.xml b/l10n_br_nfe/views/supplier_info_view.xml
new file mode 100644
index 000000000000..123ef49cffe6
--- /dev/null
+++ b/l10n_br_nfe/views/supplier_info_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="l10n_br_nfe_product_supplierinfo_tree_view" model="ir.ui.view">
+        <field name="name">l10n_br_nfe.product.supplierinfo.tree.view</field>
+        <field name="model">product.supplierinfo</field>
+        <field name="inherit_id" ref="product.product_supplierinfo_tree_view" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='product_uom']" position="before">
+                <field name="product_code" />
+                <field name="partner_uom_factor" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="l10n_br_nfe_product_supplierinfo_form_view" model="ir.ui.view">
+        <field name="name">l10n_br_nfe.product.supplierinfo.form.view</field>
+        <field name="model">product.supplierinfo</field>
+        <field name="inherit_id" ref="product.product_supplierinfo_form_view" />
+        <field name="arch" type="xml">
+            <xpath expr="//sheet" position="inside">
+                <separator string="Import" />
+                <group id="import">
+                    <field name="partner_uom_id" />
+                    <field
+                        name="partner_uom_factor"
+                        attrs="{'required': [('partner_uom_id', '!=', False)]}"
+                    />
+                </group>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
index 2418b09160a8..ed4dd6e00b58 100644
--- a/l10n_br_nfe/wizards/import_document.py
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -38,7 +38,7 @@ class NfeImport(models.TransientModel):
             ("choose", "Choose"),
             ("create", "Create"),
         ],
-        default="choose",
+        default="create",
         string="Purchase Link Type",
     )
 
@@ -129,17 +129,20 @@ def create_imported_products_by_xml(self):
 
         self.imported_products_ids = [(6, 0, product_ids)]
 
-        if self.partner_id:
-            self.imported_products_ids._set_product_supplierinfo_data()
-
     def _prepare_imported_product_values(self, product):
         taxes = self._get_taxes_from_xml_product(product)
+        supplier_id = self._search_product_supplier_by_product_code(product.prod.cProd)
         product_id = self._match_product(product.prod)
         if product_id:
-            uom_id = product_id.uom_id
+            uom_id = product_id.uom_po_id
         else:
             uom_id = self.env["uom.uom"].search(
-                [("code", "=", product.prod.uCom)], limit=1
+                [
+                    "|",
+                    ("code", "=", product.prod.uCom),
+                    ("code", "=", product.prod.uTrib),
+                ],
+                limit=1,
             )
 
         return {
@@ -161,9 +164,35 @@ def _prepare_imported_product_values(self, product):
             "price_unit_trib": product.prod.vUnTrib,
             "total": product.prod.vProd,
             "import_xml_id": self.id,
+            "product_supplier_id": supplier_id.id,
+            "uom_conversion_factor": supplier_id.partner_uom_factor or 1,
         }
 
+    def _search_product_supplier_by_product_code(self, code):
+        return self.env["product.supplierinfo"].search(
+            [
+                ("name", "=", self.partner_id.id),
+                ("product_code", "=", code),
+            ],
+            limit=1,
+        )
+
+    def _get_product_by_supplier(self, code):
+        supplier_id = self._search_product_supplier_by_product_code(code)
+        if not supplier_id:
+            return False
+
+        if supplier_id.product_id:
+            return supplier_id.product_id
+
+        variant_ids = supplier_id.product_tmpl_id.product_variant_ids
+        return variant_ids[0]
+
     def _match_product(self, xml_product):
+        product_id = self._get_product_by_supplier(xml_product.cProd)
+        if product_id:
+            return product_id
+
         domain = []
         if hasattr(xml_product, "cProd"):
             domain = expression.OR([domain, [("default_code", "=", xml_product.cProd)]])
@@ -208,10 +237,7 @@ def import_xml(self):
     def find_existing_document(self):
         document = self.get_document_by_xml(self.parse_xml())
         self.document_id = self.env["l10n_br_fiscal.document"].search(
-            [
-                ("document_key", "=", document.chave),
-                ("company_id", "=", self.company_id.id),
-            ],
+            [("document_key", "=", document.chave)],
             limit=1,
         )
 
@@ -260,15 +286,18 @@ def create_purchase_order(self, document):
 
         purchase_lines = []
         for line in document.fiscal_line_ids:
-            product_uom = line.uom_id or line.product_id.uom_id
+            imported_product_id = self.imported_products_ids.filtered(
+                lambda p: p.product_id == line.product_id
+            )
+
             purchase_line = self.env["purchase.order.line"].create(
                 {
                     "product_id": line.product_id.id,
-                    "origin_document_line_id": line.id,
                     "name": line.product_id.display_name,
                     "date_planned": datetime.now(),
                     "product_qty": line.quantity,
-                    "product_uom": product_uom.id,
+                    "product_uom": line.uom_id.id or line.product_id.uom_id.id,
+                    "partner_uom_factor": imported_product_id.uom_conversion_factor,
                     "price_unit": line.price_unit,
                     "price_subtotal": line.amount_total,
                     "order_id": purchase.id,
@@ -301,6 +330,7 @@ def _edit_parsed_xml(self, parsed_xml):
             internal_product = product_line.product_id
             for xml_product in parsed_xml.NFe.infNFe.det:
                 if xml_product.prod.cProd == product_line.product_code:
+                    xml_product.prod.cProd = internal_product.default_code
                     xml_product.prod.xProd = internal_product.name
                     xml_product.prod.cEAN = internal_product.barcode or "SEM GTIN"
                     xml_product.prod.cEANTrib = internal_product.barcode or "SEM GTIN"
@@ -383,35 +413,10 @@ class NfeImportProducts(models.TransientModel):
 
     imported_partner_id = fields.Many2one(related="import_xml_id.partner_id")
 
-    @api.onchange("product_id")
-    def onchange_product_id(self):
-        if self.product_id and not self.product_id.ncm_id:
-            raise UserError(_("Product without NCM!"))
-
-    def _search_product_supplier(self):
-        return self.env["product.supplierinfo"].search(
-            [
-                ("name", "=", self.imported_partner_id.id),
-                ("product_code", "=", self.product_code),
-            ],
-            limit=1,
-        )
-
-    def _set_product_supplierinfo_data(self):
-        for product in self:
-            if not product.product_supplier_id:
-                product.product_supplier_id = product._search_product_supplier()
-
-            if product.product_supplier_id:
-                product.product_id = product.product_supplier_id.product_id
+    uom_conversion_factor = fields.Float(string="UOM Conversion Factor", default=1)
 
     def _find_or_create_product_supplierinfo(self):
         for product in self:
-            if not product.product_id:
-                product.product_id = self.env["product.product"].search(
-                    [("default_code", "=", product.product_code)], limit=1
-                )
-
             if not product.product_id:
                 continue
 
@@ -423,6 +428,11 @@ def _find_or_create_product_supplierinfo(self):
             else:
                 product._update_product_supplier()
 
+    def _search_product_supplier(self):
+        return self.import_xml_id._search_product_supplier_by_product_code(
+            self.product_code
+        )
+
     def _create_product_supplier(self):
         if self.uom_internal:
             price = self.uom_internal._compute_price(
@@ -439,6 +449,7 @@ def _create_product_supplier(self):
                 "price": price,
                 "name": self.imported_partner_id.id,
                 "partner_uom_id": self.uom_internal.id,
+                "partner_uom_factor": self.uom_conversion_factor,
             }
         )
         self.product_id.write({"seller_ids": [(4, self.product_supplier_id.id)]})
@@ -453,5 +464,6 @@ def _update_product_supplier(self):
                     self.price_unit_com, self.product_id.uom_id
                 ),
                 "partner_uom_id": self.uom_internal.id,
+                "partner_uom_factor": self.uom_conversion_factor,
             }
         )
diff --git a/l10n_br_nfe/wizards/import_document.xml b/l10n_br_nfe/wizards/import_document.xml
index 51000763036b..2fc48cdea7ac 100644
--- a/l10n_br_nfe/wizards/import_document.xml
+++ b/l10n_br_nfe/wizards/import_document.xml
@@ -82,9 +82,10 @@
                 />
                 <field name="product_name" readonly="1" />
                 <field name="product_code" readonly="1" />
+                <field name="uom_internal" />
+                <field name="uom_conversion_factor" />
                 <field name="ncm_xml" readonly="1" />
                 <field name="ncm_internal" readonly="1" />
-                <field name="uom_internal" />
                 <field name="cfop_xml" readonly="1" />
                 <field name="new_cfop_id" />
                 <field name="icms_percent" readonly="1" />

From 72a1732c16d8fa26a6d9390da6a9d04a93a66255 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Fri, 1 Sep 2023 09:07:13 -0300
Subject: [PATCH 14/25] [ADD] UOM factor on creating stock moves

---
 l10n_br_purchase/models/purchase_order_line.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/l10n_br_purchase/models/purchase_order_line.py b/l10n_br_purchase/models/purchase_order_line.py
index 8b0ac69416a0..c49eed240106 100644
--- a/l10n_br_purchase/models/purchase_order_line.py
+++ b/l10n_br_purchase/models/purchase_order_line.py
@@ -79,9 +79,7 @@ def _fiscal_operation_domain(self):
         related="company_id.delivery_costs",
     )
 
-    origin_document_line_id = fields.Many2one(
-        comodel_name="l10n_br_fiscal.document.line"
-    )
+    partner_uom_factor = fields.Float(string="Partner UOM Factor")
 
     @api.depends(
         "product_uom_qty",
@@ -148,3 +146,15 @@ def _prepare_account_move_line(self, move=False):
             values.update(fiscal_values)
 
         return values
+
+    def _prepare_stock_move_vals(
+        self, picking, price_unit, product_uom_qty, product_uom
+    ):
+        res = super()._prepare_stock_move_vals(
+            picking, price_unit, product_uom_qty, product_uom
+        )
+
+        if self.partner_uom_factor:
+            res["product_uom_qty"] = product_uom_qty * self.partner_uom_factor
+
+        return res

From eea4a841a01d4aaced65239bb75fcdb6880f8c6d Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Fri, 1 Sep 2023 09:33:49 -0300
Subject: [PATCH 15/25] [FIX] import NFe tests

---
 l10n_br_nfe/tests/test_nfe_import_wizard.py | 15 +++------------
 l10n_br_nfe/wizards/import_document.py      |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/l10n_br_nfe/tests/test_nfe_import_wizard.py b/l10n_br_nfe/tests/test_nfe_import_wizard.py
index c9f8fbb07e06..468d1da50aee 100644
--- a/l10n_br_nfe/tests/test_nfe_import_wizard.py
+++ b/l10n_br_nfe/tests/test_nfe_import_wizard.py
@@ -135,11 +135,6 @@ def test_imported_products(self):
         first_product = self.wizard.imported_products_ids[0]
         old_product_id = first_product.product_id
 
-        first_product.onchange_product_id()
-        first_product.product_id = self.product_1
-        with self.assertRaises(UserError):
-            first_product.onchange_product_id()
-
         first_product.product_id = False
         first_product.product_name = False
         first_product.product_code = "???"
@@ -150,7 +145,8 @@ def test_imported_products(self):
         first_product.product_id = old_product_id
         self.assertNotEqual(first_product.product_id, self.product_1)
 
-        self.supplier_info = self.env["product.supplierinfo"].create(
+        self.wizard.partner_id = self.partner_1
+        first_product.product_supplier_id = self.env["product.supplierinfo"].create(
             {
                 "product_id": self.product_1.id,
                 "name": self.partner_1.id,
@@ -158,13 +154,7 @@ def test_imported_products(self):
                 "price": 100,
             }
         )
-        self.wizard.partner_id = self.partner_1
-
-        first_product.product_code = False
-        first_product._set_product_supplierinfo_data()
         wiz_supplier_id = first_product.product_supplier_id
-        self.assertEqual(wiz_supplier_id, self.supplier_info)
-        self.assertEqual(first_product.product_id, self.supplier_info.product_id)
 
         first_product._find_or_create_product_supplierinfo()
         self.assertEqual(wiz_supplier_id.product_id, first_product.product_id)
@@ -200,6 +190,7 @@ def test_match_xml_product(self):
             {"name": "TEST2", "barcode": "123456789123"}
         )
         mock_barcode = MagicMock(spec=["cEANTrib"])
+        mock_barcode.cProd = False
         mock_barcode.cEANTrib = "123456789123"
         prod_id = self.wizard._match_product(mock_barcode)
         self.assertEqual(prod_id, prod_barcode)
diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
index ed4dd6e00b58..26145c0dbd38 100644
--- a/l10n_br_nfe/wizards/import_document.py
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -194,7 +194,7 @@ def _match_product(self, xml_product):
             return product_id
 
         domain = []
-        if hasattr(xml_product, "cProd"):
+        if hasattr(xml_product, "cProd") and xml_product.cProd:
             domain = expression.OR([domain, [("default_code", "=", xml_product.cProd)]])
 
         if hasattr(xml_product, "cEANTrib") and xml_product.cEANTrib != "SEM GTIN":

From 2ade41ac9ab6a93d9a0f934502d4557eb10cc080 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Fri, 1 Sep 2023 09:44:23 -0300
Subject: [PATCH 16/25] [FIX] nfe import find supplier

---
 l10n_br_nfe/wizards/import_document.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
index 26145c0dbd38..8ace63e19b62 100644
--- a/l10n_br_nfe/wizards/import_document.py
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -421,18 +421,10 @@ def _find_or_create_product_supplierinfo(self):
                 continue
 
             if not product.product_supplier_id:
-                product.product_supplier_id = product._search_product_supplier()
-
-                if not product.product_supplier_id:
-                    product._create_product_supplier()
+                product._create_product_supplier()
             else:
                 product._update_product_supplier()
 
-    def _search_product_supplier(self):
-        return self.import_xml_id._search_product_supplier_by_product_code(
-            self.product_code
-        )
-
     def _create_product_supplier(self):
         if self.uom_internal:
             price = self.uom_internal._compute_price(

From 72088cf604c0cb00ab15fd4e97897dba637a4094 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Fri, 1 Sep 2023 10:04:36 -0300
Subject: [PATCH 17/25] [FIX] remove comment

---
 l10n_br_nfe/wizards/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/l10n_br_nfe/wizards/__init__.py b/l10n_br_nfe/wizards/__init__.py
index abfaf1f530dc..f7643687c320 100644
--- a/l10n_br_nfe/wizards/__init__.py
+++ b/l10n_br_nfe/wizards/__init__.py
@@ -1,3 +1,3 @@
-# from . import l10n_br_account_nfe_export_invoice
-# from . import l10n_br_account_nfe_export
+from . import l10n_br_account_nfe_export_invoice
+from . import l10n_br_account_nfe_export
 from . import import_document

From 096f9d467bd407e12db77374dc917d0f8211ea86 Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Mon, 4 Sep 2023 18:19:48 -0300
Subject: [PATCH 18/25] [FIX] match products with supplier info

---
 l10n_br_nfe/models/product_product.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/l10n_br_nfe/models/product_product.py b/l10n_br_nfe/models/product_product.py
index 542700006dba..429875b3390b 100644
--- a/l10n_br_nfe/models/product_product.py
+++ b/l10n_br_nfe/models/product_product.py
@@ -24,6 +24,13 @@ def match_or_create_m2o(self, rec_dict, parent_dict, model=None):
 
         if parent_dict.get("nfe40_cProd"):
             rec_dict["default_code"] = parent_dict["nfe40_cProd"]
+
+            supplier_id = self.env["product.supplierinfo"].search(
+                [("product_code", "=", parent_dict["nfe40_cProd"])], limit=1
+            )
+            if supplier_id and supplier_id.product_id:
+                return supplier_id.product_id.id
+
             domain_default_code = [("default_code", "=", rec_dict.get("default_code"))]
 
         domain = expression.OR([domain_name, domain_barcode, domain_default_code])

From 28565766ebadf1c15a16e7883a7f80adbc9c254f Mon Sep 17 00:00:00 2001
From: Felipe Zago <felipe.zago@kmee.com.br>
Date: Wed, 13 Sep 2023 15:13:59 -0300
Subject: [PATCH 19/25] [ADD] update purchase order on import, and add error
 messages

---
 l10n_br_nfe/wizards/import_document.py  | 61 +++++++++++++++++++++++++
 l10n_br_nfe/wizards/import_document.xml |  9 ++++
 2 files changed, 70 insertions(+)

diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
index 8ace63e19b62..1e928fab8b85 100644
--- a/l10n_br_nfe/wizards/import_document.py
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -47,6 +47,10 @@ class NfeImport(models.TransientModel):
         string="Purchase Order",
     )
 
+    has_purchase_error = fields.Boolean()
+
+    purchase_error_message = fields.Text()
+
     @api.onchange("xml")
     def _onchange_xml(self):
         if self.xml:
@@ -60,6 +64,50 @@ def _onchange_partner_cpf_cnpj(self):
         purchase_order_ids = self.get_purchase_orders_from_xml_supplier()
         return {"domain": {"purchase_id": [("id", "in", purchase_order_ids.ids)]}}
 
+    @api.depends("purchase_link_type")
+    def _onchange_link_type(self):
+        self.has_purchase_error = False
+        self.purchase_error_message = ""
+
+    @api.onchange("purchase_id")
+    def _onchange_purchase_id(self):
+        self.has_purchase_error = False
+        self.purchase_error_message = ""
+
+        if not self.purchase_id:
+            return
+
+        purchase_products = self.purchase_id.order_line.mapped("product_id")
+        document_products = self.imported_products_ids.mapped("product_id")
+        if purchase_products != document_products:
+            self.has_purchase_error = True
+            self.purchase_error_message += _(
+                "The purchase items dont match the imported items."
+            )
+            return
+
+        for line in self.purchase_id.order_line:
+            imported_product_id = self.imported_products_ids.filtered(
+                lambda s: s.product_id == line.product_id
+            )
+            if imported_product_id.quantity_com != line.product_qty:
+                self.has_purchase_error = True
+                if self.purchase_error_message:
+                    self.purchase_error_message += "\n\n"
+                self.purchase_error_message += _(
+                    "%s: Purchase order quantity dont match the imported quantity. "
+                    "The quantity will be overwriten." % line.product_id.name
+                )
+
+            if imported_product_id.price_unit_com != line.price_unit:
+                self.has_purchase_error = True
+                if self.purchase_error_message:
+                    self.purchase_error_message += "\n\n"
+                self.purchase_error_message += _(
+                    "%s: Purchase order price dont match the imported price. "
+                    "The price will be overwriten." % line.product_id.name
+                )
+
     def get_purchase_orders_from_xml_supplier(self):
         supplier_id = self.env["res.partner"].search(
             [("cnpj_cpf", "=", self.xml_partner_cpf_cnpj)]
@@ -257,6 +305,8 @@ def create_edoc_from_xml(self):
 
         if not self.purchase_id and self.purchase_link_type == "create":
             self.purchase_id = self.create_purchase_order(edoc)
+        elif self.purchase_id and self.purchase_link_type == "choose":
+            self.update_purchase_order()
 
         if self.purchase_id:
             self.purchase_id.button_confirm()
@@ -307,6 +357,17 @@ def create_purchase_order(self, document):
         purchase.write({"order_line": [(6, 0, purchase_lines)]})
         return purchase
 
+    def update_purchase_order(self):
+        for line in self.purchase_id.order_line:
+            imported_product_id = self.imported_products_ids.filtered(
+                lambda s: s.product_id == line.product_id
+            )
+            if not imported_product_id:
+                continue
+
+            line.price_unit = imported_product_id.price_unit_com
+            line.product_qty = imported_product_id.quantity_com
+
     def get_purchase_fiscal_operation_id(self):
         default_fiscal_operation_id = self.env.ref("l10n_br_fiscal.fo_compras").id
         return (
diff --git a/l10n_br_nfe/wizards/import_document.xml b/l10n_br_nfe/wizards/import_document.xml
index 2fc48cdea7ac..4a7d8a4633a4 100644
--- a/l10n_br_nfe/wizards/import_document.xml
+++ b/l10n_br_nfe/wizards/import_document.xml
@@ -46,6 +46,15 @@
                             />
                         </group>
                     </group>
+                    <group colspan="4" col="1">
+                        <field name="has_purchase_error" invisible="1" />
+                        <field
+                            name="purchase_error_message"
+                            nolabel="1"
+                            readonly="1"
+                            attrs="{'invisible': [('has_purchase_error', '=', False)]}"
+                        />
+                    </group>
                     <separator string="NFe XML Products" colspan="4" />
                     <group
                         colspan="4"

From 584222ec6295ff10dbbd74993c262b528acbbb76 Mon Sep 17 00:00:00 2001
From: Renan Hiroki Bastos <hirokibastos@gmail.com>
Date: Mon, 9 Oct 2023 18:03:14 -0300
Subject: [PATCH 20/25] Removed nfe related content from l10n_br_purchase

---
 l10n_br_purchase/__manifest__.py              |  1 -
 l10n_br_purchase/models/__init__.py           |  2 --
 l10n_br_purchase/models/document.py           | 24 -----------------
 .../models/document_fiscal_mixin_methods.py   | 20 --------------
 l10n_br_purchase/models/purchase_order.py     | 24 +++++++----------
 .../models/purchase_order_line.py             | 14 ----------
 l10n_br_purchase/views/document_view.xml      | 27 -------------------
 l10n_br_purchase/views/purchase_view.xml      | 22 ---------------
 8 files changed, 9 insertions(+), 125 deletions(-)
 delete mode 100644 l10n_br_purchase/models/document.py
 delete mode 100644 l10n_br_purchase/models/document_fiscal_mixin_methods.py
 delete mode 100644 l10n_br_purchase/views/document_view.xml

diff --git a/l10n_br_purchase/__manifest__.py b/l10n_br_purchase/__manifest__.py
index adc531a628fe..7bd28310a699 100644
--- a/l10n_br_purchase/__manifest__.py
+++ b/l10n_br_purchase/__manifest__.py
@@ -18,7 +18,6 @@
         # View
         "views/purchase_view.xml",
         "views/res_company_view.xml",
-        "views/document_view.xml",
         # Reports
         "reports/purchase_report_views.xml",
         "reports/purchase_order_templates.xml",
diff --git a/l10n_br_purchase/models/__init__.py b/l10n_br_purchase/models/__init__.py
index 9a892ffedc67..761f6410c535 100644
--- a/l10n_br_purchase/models/__init__.py
+++ b/l10n_br_purchase/models/__init__.py
@@ -5,5 +5,3 @@
 from . import purchase_order
 from . import purchase_order_line
 from . import account_move
-from . import document_fiscal_mixin_methods
-from . import document
diff --git a/l10n_br_purchase/models/document.py b/l10n_br_purchase/models/document.py
deleted file mode 100644
index 7dc2d833915c..000000000000
--- a/l10n_br_purchase/models/document.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2023 KMEE (Felipe Zago Rodrigues <felipe.zago@kmee.com.br>)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, fields, models
-
-
-class FiscalDocument(models.Model):
-    _inherit = "l10n_br_fiscal.document"
-
-    linked_purchase_ids = fields.Many2many(
-        comodel_name="purchase.order",
-        relation="fiscal_document_purchase_rel_1",
-        column1="document_id",
-        column2="purchase_id",
-        string="Ordens de Compra",
-        copy=False,
-    )
-
-    linked_purchase_count = fields.Integer(compute="_compute_linked_purchase_count")
-
-    @api.depends("linked_purchase_ids")
-    def _compute_linked_purchase_count(self):
-        for rec in self:
-            rec.linked_purchase_count = len(rec.linked_purchase_ids)
diff --git a/l10n_br_purchase/models/document_fiscal_mixin_methods.py b/l10n_br_purchase/models/document_fiscal_mixin_methods.py
deleted file mode 100644
index 4244eb3592ef..000000000000
--- a/l10n_br_purchase/models/document_fiscal_mixin_methods.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2023 KMEE (Felipe Zago Rodrigues <felipe.zago@kmee.com.br>)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import models
-
-
-class FiscalDocumentMixinMethods(models.AbstractModel):
-    _inherit = "l10n_br_fiscal.document.mixin.methods"
-
-    def action_open_purchase(self):
-        result = self.env.ref("l10n_br_purchase.action_purchase_tree_all").read()[0]
-        purchase_ids = self.mapped("linked_purchase_ids")
-
-        if len(purchase_ids) == 1:
-            result = self.env.ref("l10n_br_purchase.action_purchase_form_all").read()[0]
-            result["res_id"] = purchase_ids[0].id
-        else:
-            result["domain"] = "[('id', 'in', %s)]" % (purchase_ids.ids)
-
-        return result
diff --git a/l10n_br_purchase/models/purchase_order.py b/l10n_br_purchase/models/purchase_order.py
index 0b6b2a842179..f761f68c3c54 100644
--- a/l10n_br_purchase/models/purchase_order.py
+++ b/l10n_br_purchase/models/purchase_order.py
@@ -53,10 +53,6 @@ def _fiscal_operation_domain(self):
         string="Comments",
     )
 
-    imported = fields.Boolean(string="Imported")
-
-    origin_document_id = fields.Many2one(comodel_name="l10n_br_fiscal.document")
-
     @api.model
     def fields_view_get(
         self, view_id=None, view_type="form", toolbar=False, submenu=False
@@ -103,14 +99,12 @@ def _amount_all(self):
 
     def _prepare_invoice(self):
         self.ensure_one()
-
-        return {
-            **super()._prepare_invoice(),
-            "ind_final": self.ind_final,
-            "fiscal_operation_id": self.fiscal_operation_id.id,
-            "fiscal_document_id": self.origin_document_id.id,
-            "document_type_id": (
-                self.origin_document_id.document_type_id.id
-                or self.company_id.document_type_id.id
-            ),
-        }
+        invoice_vals = super()._prepare_invoice()
+        invoice_vals.update(
+            {
+                "ind_final": self.ind_final,
+                "fiscal_operation_id": self.fiscal_operation_id.id,
+                "document_type_id": self.company_id.document_type_id.id,
+            }
+        )
+        return invoice_vals
diff --git a/l10n_br_purchase/models/purchase_order_line.py b/l10n_br_purchase/models/purchase_order_line.py
index c49eed240106..04bc92abb1ff 100644
--- a/l10n_br_purchase/models/purchase_order_line.py
+++ b/l10n_br_purchase/models/purchase_order_line.py
@@ -79,8 +79,6 @@ def _fiscal_operation_domain(self):
         related="company_id.delivery_costs",
     )
 
-    partner_uom_factor = fields.Float(string="Partner UOM Factor")
-
     @api.depends(
         "product_uom_qty",
         "price_unit",
@@ -146,15 +144,3 @@ def _prepare_account_move_line(self, move=False):
             values.update(fiscal_values)
 
         return values
-
-    def _prepare_stock_move_vals(
-        self, picking, price_unit, product_uom_qty, product_uom
-    ):
-        res = super()._prepare_stock_move_vals(
-            picking, price_unit, product_uom_qty, product_uom
-        )
-
-        if self.partner_uom_factor:
-            res["product_uom_qty"] = product_uom_qty * self.partner_uom_factor
-
-        return res
diff --git a/l10n_br_purchase/views/document_view.xml b/l10n_br_purchase/views/document_view.xml
deleted file mode 100644
index e0222abecd08..000000000000
--- a/l10n_br_purchase/views/document_view.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<odoo>
-    <record id="l10n_br_purchase_document_form" model="ir.ui.view">
-        <field
-            name="name"
-        >l10n_br_nfe.fiscal.purchase.document.form (in l10n_br_purchase)</field>
-        <field name="model">l10n_br_fiscal.document</field>
-        <field name="inherit_id" ref="l10n_br_fiscal.document_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//div[@name='button_box']" position="inside">
-                <field name="linked_purchase_ids" invisible="1" />
-                <button
-                    type="object"
-                    name="action_open_purchase"
-                    class="oe_stat_button"
-                    icon="fa-folder-open"
-                    attrs="{'invisible':[('linked_purchase_ids', '=', [])]}"
-                >
-                    <field
-                        name="linked_purchase_count"
-                        widget="statinfo"
-                        string="Purchase Orders"
-                    />
-                </button>
-            </xpath>
-        </field>
-    </record>
-</odoo>
diff --git a/l10n_br_purchase/views/purchase_view.xml b/l10n_br_purchase/views/purchase_view.xml
index cab5719cbeb8..bebdaa193f5b 100644
--- a/l10n_br_purchase/views/purchase_view.xml
+++ b/l10n_br_purchase/views/purchase_view.xml
@@ -157,13 +157,6 @@
                     options="{'currency_field': 'currency_id'}"
                 />
               </xpath>
-              <xpath expr="//group[@name='other_info']" position="inside">
-                  <field name="imported" readonly="1" />
-                  <field
-                    name="origin_document_id"
-                    attrs="{'invisible': [('imported', '=', False)]}"
-                />
-              </xpath>
           </field>
       </record>
 
@@ -180,19 +173,4 @@
           </field>
       </record>
 
-    <record id="action_purchase_tree_all" model="ir.actions.act_window">
-        <field name="name">Purchases</field>
-        <field name="res_model">purchase.order</field>
-        <field name="type">form</field>
-        <field name="view_mode">tree,kanban,form</field>
-        <field name="view_id" ref="purchase.purchase_order_tree" />
-    </record>
-
-    <record id="action_purchase_form_all" model="ir.actions.act_window">
-        <field name="name">Purchase</field>
-        <field name="res_model">purchase.order</field>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="purchase.purchase_order_form" />
-    </record>
-
 </odoo>

From 3e117bb83c624b2bd544aabf3ab1f1ce00f43af6 Mon Sep 17 00:00:00 2001
From: Renan Hiroki Bastos <hirokibastos@gmail.com>
Date: Mon, 9 Oct 2023 18:05:09 -0300
Subject: [PATCH 21/25] Removed purchase related content from l10n_br_nfe

---
 l10n_br_nfe/__manifest__.py             |   1 -
 l10n_br_nfe/wizards/import_document.py  | 146 +-----------------------
 l10n_br_nfe/wizards/import_document.xml |  25 +---
 3 files changed, 7 insertions(+), 165 deletions(-)

diff --git a/l10n_br_nfe/__manifest__.py b/l10n_br_nfe/__manifest__.py
index ca996dc0bd2c..07c879b941f3 100644
--- a/l10n_br_nfe/__manifest__.py
+++ b/l10n_br_nfe/__manifest__.py
@@ -16,7 +16,6 @@
         "l10n_br_fiscal",
         "l10n_br_fiscal_certificate",
         "l10n_br_nfe_spec",
-        "l10n_br_purchase",
         "spec_driven_model",
         "l10n_br_fiscal_dfe",
     ],
diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
index 1e928fab8b85..5faad989b0bc 100644
--- a/l10n_br_nfe/wizards/import_document.py
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -5,7 +5,6 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
 import base64
-from datetime import datetime
 
 from erpbrasil.base.fiscal.edoc import detectar_chave_edoc
 from nfelib.nfe.bindings.v4_0.leiaute_nfe_v4_00 import TnfeProc
@@ -14,6 +13,8 @@
 from odoo.exceptions import UserError
 from odoo.osv import expression
 
+# from datetime import datetime
+
 
 class NfeImport(models.TransientModel):
     """Importar XML Nota Fiscal Eletrônica"""
@@ -33,92 +34,11 @@ class NfeImport(models.TransientModel):
 
     nat_op = fields.Char(string="Natureza da Operação")
 
-    purchase_link_type = fields.Selection(
-        selection=[
-            ("choose", "Choose"),
-            ("create", "Create"),
-        ],
-        default="create",
-        string="Purchase Link Type",
-    )
-
-    purchase_id = fields.Many2one(
-        comodel_name="purchase.order",
-        string="Purchase Order",
-    )
-
-    has_purchase_error = fields.Boolean()
-
-    purchase_error_message = fields.Text()
-
     @api.onchange("xml")
     def _onchange_xml(self):
         if self.xml:
             self.set_fields_by_xml_data()
 
-    @api.onchange("xml_partner_cpf_cnpj")
-    def _onchange_partner_cpf_cnpj(self):
-        if not self.xml_partner_cpf_cnpj:
-            return
-
-        purchase_order_ids = self.get_purchase_orders_from_xml_supplier()
-        return {"domain": {"purchase_id": [("id", "in", purchase_order_ids.ids)]}}
-
-    @api.depends("purchase_link_type")
-    def _onchange_link_type(self):
-        self.has_purchase_error = False
-        self.purchase_error_message = ""
-
-    @api.onchange("purchase_id")
-    def _onchange_purchase_id(self):
-        self.has_purchase_error = False
-        self.purchase_error_message = ""
-
-        if not self.purchase_id:
-            return
-
-        purchase_products = self.purchase_id.order_line.mapped("product_id")
-        document_products = self.imported_products_ids.mapped("product_id")
-        if purchase_products != document_products:
-            self.has_purchase_error = True
-            self.purchase_error_message += _(
-                "The purchase items dont match the imported items."
-            )
-            return
-
-        for line in self.purchase_id.order_line:
-            imported_product_id = self.imported_products_ids.filtered(
-                lambda s: s.product_id == line.product_id
-            )
-            if imported_product_id.quantity_com != line.product_qty:
-                self.has_purchase_error = True
-                if self.purchase_error_message:
-                    self.purchase_error_message += "\n\n"
-                self.purchase_error_message += _(
-                    "%s: Purchase order quantity dont match the imported quantity. "
-                    "The quantity will be overwriten." % line.product_id.name
-                )
-
-            if imported_product_id.price_unit_com != line.price_unit:
-                self.has_purchase_error = True
-                if self.purchase_error_message:
-                    self.purchase_error_message += "\n\n"
-                self.purchase_error_message += _(
-                    "%s: Purchase order price dont match the imported price. "
-                    "The price will be overwriten." % line.product_id.name
-                )
-
-    def get_purchase_orders_from_xml_supplier(self):
-        supplier_id = self.env["res.partner"].search(
-            [("cnpj_cpf", "=", self.xml_partner_cpf_cnpj)]
-        )
-        return self.env["purchase.order"].search(
-            [
-                ("partner_id", "=", supplier_id.id),
-                ("state", "not in", ["done", "cancel"]),
-            ]
-        )
-
     def set_fields_by_xml_data(self):
         parsed_xml = self.parse_xml()
         document = self.get_document_by_xml(parsed_xml)
@@ -303,15 +223,6 @@ def create_edoc_from_xml(self):
         self._attach_original_nfe_xml_to_document(edoc)
         self.imported_products_ids._find_or_create_product_supplierinfo()
 
-        if not self.purchase_id and self.purchase_link_type == "create":
-            self.purchase_id = self.create_purchase_order(edoc)
-        elif self.purchase_id and self.purchase_link_type == "choose":
-            self.update_purchase_order()
-
-        if self.purchase_id:
-            self.purchase_id.button_confirm()
-            edoc.linked_purchase_ids = [(4, self.purchase_id.id)]
-
         return edoc
 
     def set_fiscal_operation_type(self):
@@ -322,59 +233,6 @@ def set_fiscal_operation_type(self):
         else:
             self.fiscal_operation_type = "in"
 
-    def create_purchase_order(self, document):
-        purchase = self.env["purchase.order"].create(
-            {
-                "partner_id": document.partner_id.id,
-                "currency_id": self.company_id.currency_id.id,
-                "fiscal_operation_id": self.get_purchase_fiscal_operation_id(),
-                "date_order": datetime.now(),
-                "origin_document_id": document.id,
-                "imported": True,
-            }
-        )
-
-        purchase_lines = []
-        for line in document.fiscal_line_ids:
-            imported_product_id = self.imported_products_ids.filtered(
-                lambda p: p.product_id == line.product_id
-            )
-
-            purchase_line = self.env["purchase.order.line"].create(
-                {
-                    "product_id": line.product_id.id,
-                    "name": line.product_id.display_name,
-                    "date_planned": datetime.now(),
-                    "product_qty": line.quantity,
-                    "product_uom": line.uom_id.id or line.product_id.uom_id.id,
-                    "partner_uom_factor": imported_product_id.uom_conversion_factor,
-                    "price_unit": line.price_unit,
-                    "price_subtotal": line.amount_total,
-                    "order_id": purchase.id,
-                }
-            )
-            purchase_lines.append(purchase_line.id)
-        purchase.write({"order_line": [(6, 0, purchase_lines)]})
-        return purchase
-
-    def update_purchase_order(self):
-        for line in self.purchase_id.order_line:
-            imported_product_id = self.imported_products_ids.filtered(
-                lambda s: s.product_id == line.product_id
-            )
-            if not imported_product_id:
-                continue
-
-            line.price_unit = imported_product_id.price_unit_com
-            line.product_qty = imported_product_id.quantity_com
-
-    def get_purchase_fiscal_operation_id(self):
-        default_fiscal_operation_id = self.env.ref("l10n_br_fiscal.fo_compras").id
-        return (
-            self.env.user.company_id.purchase_fiscal_operation_id.id
-            or default_fiscal_operation_id
-        )
-
     def _attach_original_nfe_xml_to_document(self, edoc):
         return self.env["ir.attachment"].create(
             {
diff --git a/l10n_br_nfe/wizards/import_document.xml b/l10n_br_nfe/wizards/import_document.xml
index 4a7d8a4633a4..4639f359e4c0 100644
--- a/l10n_br_nfe/wizards/import_document.xml
+++ b/l10n_br_nfe/wizards/import_document.xml
@@ -22,11 +22,15 @@
             </xpath>
 
             <xpath expr="//group[@id='document_info']" position="after">
-                <group attrs="{'invisible': [('document_id', '=', False)]}">
+                <group
+                    id="existing_document"
+                    attrs="{'invisible': [('document_id', '=', False)]}"
+                >
                     <field name="document_id" readonly="1" string="Existing Document" />
                 </group>
 
                 <group
+                    id='xml_product_lines'
                     col="4"
                     attrs="{
                     'invisible': [
@@ -36,25 +40,6 @@
                     ]
                 }"
                 >
-                    <separator string="Purchase Order" colspan="4" />
-                    <group colspan="4">
-                        <group>
-                            <field name="purchase_link_type" />
-                            <field
-                                name="purchase_id"
-                                attrs="{'invisible': [('purchase_link_type', '!=', 'choose')]}"
-                            />
-                        </group>
-                    </group>
-                    <group colspan="4" col="1">
-                        <field name="has_purchase_error" invisible="1" />
-                        <field
-                            name="purchase_error_message"
-                            nolabel="1"
-                            readonly="1"
-                            attrs="{'invisible': [('has_purchase_error', '=', False)]}"
-                        />
-                    </group>
                     <separator string="NFe XML Products" colspan="4" />
                     <group
                         colspan="4"

From d103c17019b2e0514a9e04b9e5e75c2bc36ea46b Mon Sep 17 00:00:00 2001
From: Renan Hiroki Bastos <hirokibastos@gmail.com>
Date: Mon, 9 Oct 2023 19:14:51 -0300
Subject: [PATCH 22/25] Consider product name on supplierinfo search

---
 l10n_br_nfe/models/product_product.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/l10n_br_nfe/models/product_product.py b/l10n_br_nfe/models/product_product.py
index 429875b3390b..fff8573fe260 100644
--- a/l10n_br_nfe/models/product_product.py
+++ b/l10n_br_nfe/models/product_product.py
@@ -11,6 +11,17 @@ class ProductProduct(models.Model):
 
     def match_or_create_m2o(self, rec_dict, parent_dict, model=None):
         domain_name, domain_barcode, domain_default_code = [], [], []
+
+        if parent_dict.get("nfe40_xProd") and parent_dict.get("nfe40_cProd"):
+            supplier_id = self.env["product.supplierinfo"].search(
+                [
+                    ("product_code", "=", parent_dict["nfe40_cProd"]),
+                    ("product_name", "=", parent_dict["nfe40_xProd"]),
+                ],
+                limit=1,
+            )
+            if supplier_id and supplier_id.product_id:
+                return supplier_id.product_id.id
         if parent_dict.get("nfe40_xProd"):
             rec_dict["name"] = parent_dict["nfe40_xProd"]
             domain_name = [("name", "=", rec_dict.get("name"))]
@@ -24,13 +35,6 @@ def match_or_create_m2o(self, rec_dict, parent_dict, model=None):
 
         if parent_dict.get("nfe40_cProd"):
             rec_dict["default_code"] = parent_dict["nfe40_cProd"]
-
-            supplier_id = self.env["product.supplierinfo"].search(
-                [("product_code", "=", parent_dict["nfe40_cProd"])], limit=1
-            )
-            if supplier_id and supplier_id.product_id:
-                return supplier_id.product_id.id
-
             domain_default_code = [("default_code", "=", rec_dict.get("default_code"))]
 
         domain = expression.OR([domain_name, domain_barcode, domain_default_code])

From 93b238e02b21206f4243b531fd9c75c0902fb8fd Mon Sep 17 00:00:00 2001
From: Renan Hiroki Bastos <hirokibastos@gmail.com>
Date: Mon, 9 Oct 2023 20:11:30 -0300
Subject: [PATCH 23/25] Removed nfe related content from purchase tests

---
 .../tests/test_l10n_br_purchase.py            | 35 -------------------
 1 file changed, 35 deletions(-)

diff --git a/l10n_br_purchase/tests/test_l10n_br_purchase.py b/l10n_br_purchase/tests/test_l10n_br_purchase.py
index fdb2dfa79e6b..62ee2b3ab2e8 100644
--- a/l10n_br_purchase/tests/test_l10n_br_purchase.py
+++ b/l10n_br_purchase/tests/test_l10n_br_purchase.py
@@ -149,25 +149,6 @@ def setUpClass(cls):
             },
         }
 
-        cls.product_1 = cls.env["product.product"].create(
-            {
-                "name": "PRODUCT TEST 1",
-                "list_price": 10,
-                "uom_id": cls.env.ref("uom.product_uom_unit").id,
-            }
-        )
-        cls.nfe_fiscal_document = cls.env["l10n_br_fiscal.document"].create(
-            {
-                "document_type_id": cls.env.ref(
-                    "l10n_br_fiscal.document_55_serie_1"
-                ).id,
-                "fiscal_operation_type": "out",
-                "fiscal_line_ids": [
-                    (0, 0, {"name": "LINE TEST 1", "product_id": cls.product_1.id})
-                ],
-            }
-        )
-
     def _change_user_company(self, company):
         self.env.user.company_ids += company
         self.env.user.company_id = company
@@ -184,7 +165,6 @@ def _run_purchase_line_onchanges(self, purchase_line):
         purchase_line._onchange_fiscal_tax_ids()
 
     def _invoice_purchase_order(self, order):
-        order.origin_document_id = self.nfe_fiscal_document.id
         order.with_context(tracking_disable=True).button_confirm()
 
         invoice_values = {
@@ -195,21 +175,6 @@ def _invoice_purchase_order(self, order):
         invoice_values.update(order._prepare_br_fiscal_dict())
         document_type_id = order._context.get("document_type_id")
 
-        invoice_values.update(order._prepare_invoice())
-        self.assertEqual(
-            invoice_values["fiscal_document_id"], self.nfe_fiscal_document.id
-        )
-
-        self.nfe_fiscal_document.linked_purchase_ids = [(4, order.id)]
-        action = self.nfe_fiscal_document.action_open_purchase()
-        self.assertEqual(action["res_id"], order.id)
-
-        self.nfe_fiscal_document.linked_purchase_ids = [(4, order.copy().id)]
-        action = self.nfe_fiscal_document.action_open_purchase()
-        self.assertIn("domain", action)
-
-        self.assertEqual(self.nfe_fiscal_document.linked_purchase_count, 2)
-
         if document_type_id:
             document_type = self.env["l10n_br_fiscal.document.type"].browse(
                 document_type_id

From c9671f3d9f0da0cca9d0cbf7f421453fe6b46aa5 Mon Sep 17 00:00:00 2001
From: Renan Hiroki Bastos <hirokibastos@gmail.com>
Date: Mon, 9 Oct 2023 20:12:01 -0300
Subject: [PATCH 24/25] Removed purchase related content from nfe tests

---
 l10n_br_nfe/tests/test_nfe_import_wizard.py | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/l10n_br_nfe/tests/test_nfe_import_wizard.py b/l10n_br_nfe/tests/test_nfe_import_wizard.py
index 468d1da50aee..d00b76187e60 100644
--- a/l10n_br_nfe/tests/test_nfe_import_wizard.py
+++ b/l10n_br_nfe/tests/test_nfe_import_wizard.py
@@ -103,14 +103,12 @@ def test_import_nfe_xml(self):
 
     def test_create_edoc_from_xml(self):
         self._prepare_wizard(self.xml_1)
-        self.wizard.purchase_link_type = "create"
 
         self.wizard.partner_id = False
         edoc = self.wizard.create_edoc_from_xml()
         self.assertEqual(self.wizard.partner_id, edoc.partner_id)
 
         self.check_edoc(edoc)
-        self.assertIn(self.wizard.purchase_id, edoc.linked_purchase_ids)
 
     def test_set_fiscal_operation_type(self):
         self._prepare_wizard(self.xml_1)
@@ -220,21 +218,3 @@ def test_parse_xml(self):
         self.assertEqual(taxes["vICMS"], 100)
         self.assertEqual(taxes["pIPI"], 5)
         self.assertEqual(taxes["vIPI"], 100)
-
-    def test_onchange_cnpj(self):
-        self._prepare_wizard(self.xml_1)
-
-        self.env["purchase.order"].create(
-            {"partner_id": self.env.ref("l10n_br_base.lucro_presumido_partner").id}
-        )
-        self.env["purchase.order"].create(
-            {"partner_id": self.env.ref("l10n_br_base.lucro_presumido_partner").id}
-        )
-        domain = self.wizard._onchange_partner_cpf_cnpj()
-
-        self.assertTrue(domain["domain"])
-        self.assertTrue(domain["domain"]["purchase_id"])
-
-        self.wizard.xml_partner_cpf_cnpj = False
-        domain = self.wizard._onchange_partner_cpf_cnpj()
-        self.assertIsNone(domain)

From 4881717b2fbb10158b1e6497e2fe24ffa8daaa52 Mon Sep 17 00:00:00 2001
From: Renan Hiroki Bastos <hirokibastos@gmail.com>
Date: Mon, 9 Oct 2023 22:48:28 -0300
Subject: [PATCH 25/25] [REF] Make wizard methods private

---
 l10n_br_nfe/tests/test_nfe_import_wizard.py | 18 ++++-----
 l10n_br_nfe/wizards/import_document.py      | 44 ++++++++++-----------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/l10n_br_nfe/tests/test_nfe_import_wizard.py b/l10n_br_nfe/tests/test_nfe_import_wizard.py
index d00b76187e60..2f1699c75f8d 100644
--- a/l10n_br_nfe/tests/test_nfe_import_wizard.py
+++ b/l10n_br_nfe/tests/test_nfe_import_wizard.py
@@ -66,9 +66,9 @@ def test_import_nfe_xml(self):
         mock_document = MagicMock(spec=["modelo_documento"])
         mock_document.modelo_documento = "65"
         with patch.object(
-            NfeImport, "get_document_by_xml", return_value=mock_document
+            NfeImport, "_get_document_by_xml", return_value=mock_document
         ), self.assertRaises(UserError):
-            self.wizard.check_xml_data(self.wizard.parse_xml())
+            self.wizard._check_xml_data(self.wizard._parse_xml())
 
         self._prepare_wizard(self.xml_1)
         self.wizard.import_xml()
@@ -105,7 +105,7 @@ def test_create_edoc_from_xml(self):
         self._prepare_wizard(self.xml_1)
 
         self.wizard.partner_id = False
-        edoc = self.wizard.create_edoc_from_xml()
+        edoc = self.wizard._create_edoc_from_xml()
         self.assertEqual(self.wizard.partner_id, edoc.partner_id)
 
         self.check_edoc(edoc)
@@ -113,18 +113,18 @@ def test_create_edoc_from_xml(self):
     def test_set_fiscal_operation_type(self):
         self._prepare_wizard(self.xml_1)
 
-        doc = self.wizard.get_document_by_xml(self.wizard.parse_xml())
+        doc = self.wizard._get_document_by_xml(self.wizard._parse_xml())
         origin_company = self.wizard.company_id
 
         doc_company_id = self.env["res.company"].search(
             [("nfe40_CNPJ", "=", re.sub("[^0-9]", "", doc.cnpj_cpf_emitente))], limit=1
         )
         self.wizard.company_id = doc_company_id
-        self.wizard.set_fiscal_operation_type()
+        self.wizard._set_fiscal_operation_type()
         self.assertEqual(self.wizard.fiscal_operation_type, "out")
 
         self.wizard.company_id = origin_company
-        self.wizard.set_fiscal_operation_type()
+        self.wizard._set_fiscal_operation_type()
         self.assertEqual(self.wizard.fiscal_operation_type, "in")
 
     def test_imported_products(self):
@@ -162,7 +162,7 @@ def test_imported_products(self):
     def test_match_xml_product(self):
         self._prepare_wizard(self.xml_1)
 
-        xml = self.wizard.parse_xml()
+        xml = self.wizard._parse_xml()
         xml_product_1 = xml.NFe.infNFe.det[0].prod
         prod_id = self.wizard._match_product(xml_product_1)
         self.assertEqual(prod_id, self.env.ref("product.product_product_10"))
@@ -197,13 +197,13 @@ def test_match_xml_product(self):
         prod_id = self.wizard._match_product(MagicMock())
         self.assertFalse(prod_id)
 
-    def test_parse_xml(self):
+    def test__parse_xml(self):
         self._prepare_wizard(self.xml_1)
 
         first_product = self.wizard.imported_products_ids[0]
         first_product.new_cfop_id = self.env.ref("l10n_br_fiscal.cfop_5111").id
 
-        xml = self.wizard.parse_xml()
+        xml = self.wizard._parse_xml()
         first_xml_product = xml.NFe.infNFe.det[0].prod
         self.assertEqual(first_xml_product.CFOP, "5111")
 
diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
index 5faad989b0bc..6d28697fd144 100644
--- a/l10n_br_nfe/wizards/import_document.py
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -37,15 +37,15 @@ class NfeImport(models.TransientModel):
     @api.onchange("xml")
     def _onchange_xml(self):
         if self.xml:
-            self.set_fields_by_xml_data()
+            self._set_fields_by_xml_data()
 
-    def set_fields_by_xml_data(self):
-        parsed_xml = self.parse_xml()
-        document = self.get_document_by_xml(parsed_xml)
+    def _set_fields_by_xml_data(self):
+        parsed_xml = self._parse_xml()
+        document = self._get_document_by_xml(parsed_xml)
         infNFe = parsed_xml.NFe.infNFe
 
-        self.find_existing_document()
-        self.check_xml_data(parsed_xml)
+        self._find_existing_document()
+        self._check_xml_data(parsed_xml)
         self.document_key = document.chave
         self.document_number = int(document.numero_documento)
         self.document_serie = int(document.numero_serie)
@@ -60,9 +60,9 @@ def set_fields_by_xml_data(self):
             limit=1,
         )
         self.nat_op = infNFe.ide.natOp
-        self.create_imported_products_by_xml()
+        self._create_imported_products_by_xml()
 
-    def parse_xml(self):
+    def _parse_xml(self):
         try:
             binding = TnfeProc.from_xml(base64.b64decode(self.xml).decode())
         except Exception as e:
@@ -70,11 +70,11 @@ def parse_xml(self):
         else:
             return self._edit_parsed_xml(binding)
 
-    def get_document_by_xml(self, xml):
+    def _get_document_by_xml(self, xml):
         return detectar_chave_edoc(xml.NFe.infNFe.Id[3:])
 
-    def check_xml_data(self, xml):
-        document = self.get_document_by_xml(xml)
+    def _check_xml_data(self, xml):
+        document = self._get_document_by_xml(xml)
         nfe_model_code = self.env.ref("l10n_br_fiscal.document_55").code
 
         if document.modelo_documento != nfe_model_code:
@@ -85,8 +85,8 @@ def check_xml_data(self, xml):
                 )
             )
 
-    def create_imported_products_by_xml(self):
-        xml = self.parse_xml()
+    def _create_imported_products_by_xml(self):
+        xml = self._parse_xml()
         product_ids = []
         for product in xml.NFe.infNFe.det:
             product_ids.append(
@@ -196,24 +196,24 @@ def _get_taxes_from_xml_product(self, product):
         return {"vICMS": vICMS, "pICMS": pICMS, "vIPI": vIPI, "pIPI": pIPI}
 
     def import_xml(self):
-        self.find_existing_document()
+        self._find_existing_document()
         if not self.document_id:
-            self.document_id = self.create_edoc_from_xml()
+            self.document_id = self._create_edoc_from_xml()
 
         return self.action_open_document()
 
-    def find_existing_document(self):
-        document = self.get_document_by_xml(self.parse_xml())
+    def _find_existing_document(self):
+        document = self._get_document_by_xml(self._parse_xml())
         self.document_id = self.env["l10n_br_fiscal.document"].search(
             [("document_key", "=", document.chave)],
             limit=1,
         )
 
-    def create_edoc_from_xml(self):
-        self.set_fiscal_operation_type()
+    def _create_edoc_from_xml(self):
+        self._set_fiscal_operation_type()
 
         edoc = self.env["l10n_br_fiscal.document"].import_nfe_xml(
-            self.parse_xml(),
+            self._parse_xml(),
             edoc_type=self.fiscal_operation_type,
         )
 
@@ -225,8 +225,8 @@ def create_edoc_from_xml(self):
 
         return edoc
 
-    def set_fiscal_operation_type(self):
-        document = self.get_document_by_xml(self.parse_xml())
+    def _set_fiscal_operation_type(self):
+        document = self._get_document_by_xml(self._parse_xml())
 
         if document.cnpj_cpf_emitente == self.company_id.cnpj_cpf:
             self.fiscal_operation_type = "out"