Merge PR #1945 into 12.0

Signed-off-by rvalyi
OCA · Jun 3, 2022 · a8913db · a8913db
2 parents 4bb9d99 + 50a483a
commit a8913db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/l10n_br_nfe/models/res_company.py b/l10n_br_nfe/models/res_company.py
@@ -119,5 +119,5 @@ def _prepare_import_dict(self, values, model=None):
             values, model
         )
         if not values.get("name"):
-            values["name"] = values.get("nfe40_xNome") or values.get("nfe40_xFant")
+            values["name"] = values.get("nfe40_xFant") or values.get("nfe40_xNome")
         return values
diff --git a/l10n_br_nfe/models/res_partner.py b/l10n_br_nfe/models/res_partner.py
@@ -65,6 +65,7 @@ def _prepare_import_dict(self, values, model=None):
 
     # nfe.40.dest
     nfe40_xNome = fields.Char(related="legal_name")
+    nfe40_xFant = fields.Char(related="name")
     nfe40_enderDest = fields.Many2one(
         comodel_name="res.partner", compute="_compute_nfe40_enderDest"
     )

diff --git a/l10n_br_nfe/tests/test_nfe_import.py b/l10n_br_nfe/tests/test_nfe_import.py
@@ -38,7 +38,7 @@ def test_import_in_nfe_dry_run(self):
             .build(nfe_binding.infNFe, dry_run=True)
         )
         assert isinstance(nfe.id, NewId)
-        self.assertEqual(nfe.partner_id.name, "Alimentos Ltda.")
+        self.assertEqual(nfe.partner_id.name, "Alimentos Saudaveis")
         self.assertEqual(nfe.line_ids[0].product_id.name, "QUINOA 100G (2X50G)")
 
     def test_import_in_nfe(self):
@@ -69,7 +69,7 @@ def test_import_in_nfe(self):
 
         # here we check that emit and enderEmit
         # are now the supplier data (partner_id)
-        self.assertEqual(nfe.partner_id.name, "Alimentos Ltda.")
+        self.assertEqual(nfe.partner_id.name, "Alimentos Saudaveis")
         self.assertEqual(nfe.partner_id.cnpj_cpf, "34.128.745/0001-52")
         # this tests the _extract_related_values method for related values:
         self.assertEqual(nfe.partner_id.legal_name, "Alimentos Ltda.")