[IMP] l10n_it_fatturapa_in: commercial partner search improvement

Author: Chionne27

l10n_it_fatturapa_in/wizard/wizard_import_fatturapa.py

@@ -202,7 +202,26 @@ def getPartnerBase(self, DatiAnagrafici, partnerCreate=True):  # noqa: C901
         cf, vat = self._define_vat_fiscalcode(DatiAnagrafici)
 
         partners = self._find_partners_by_cf_vat(DatiAnagrafici)
+        commercial_partner_id = self._find_commercial_partner(DatiAnagrafici, partners)
+        if commercial_partner_id is None:
+            return False
+        if partners:
+            if not commercial_partner_id:
+                commercial_partner_id = partners[0].commercial_partner_id.id
+            self.check_partner_base_data(commercial_partner_id, DatiAnagrafici)
+            return commercial_partner_id
+        else:
+            # partner to be created
+            vals = self._prepare_partner_values(DatiAnagrafici, vat, cf)
+
+            if partnerCreate:
+                return partner_model.create(vals).id
+
+            return vals
+
+    def _find_commercial_partner(self, DatiAnagrafici, partners):
         commercial_partner_id = False
+        cf, vat = self._define_vat_fiscalcode(DatiAnagrafici)
         if len(partners) > 1:
             for partner in partners:
                 if (
@@ -216,21 +235,9 @@ def getPartnerBase(self, DatiAnagrafici, partnerCreate=True):  # noqa: C901
                             "present in db." % (vat, cf)
                         )
                     )
-                    return False
+                    return None
                 commercial_partner_id = partner.commercial_partner_id.id
-        if partners:
-            if not commercial_partner_id:
-                commercial_partner_id = partners[0].commercial_partner_id.id
-            self.check_partner_base_data(commercial_partner_id, DatiAnagrafici)
-            return commercial_partner_id
-        else:
-            # partner to be created
-            vals = self._prepare_partner_values(DatiAnagrafici, vat, cf)
-
-            if partnerCreate:
-                return partner_model.create(vals).id
-
-            return vals
+        return commercial_partner_id
 
     def _find_partners_by_cf_vat(self, DatiAnagrafici):
         partner_model = self.env["res.partner"]
@@ -274,7 +281,17 @@ def _add_company_domain_from_attachment(self, domain):
 
     def _define_vat_fiscalcode(self, DatiAnagrafici):
         cf = DatiAnagrafici.CodiceFiscale or False
-        vat = self.extract_vat(DatiAnagrafici)
+        vat = False
+        if DatiAnagrafici.IdFiscaleIVA:
+            id_paese = DatiAnagrafici.IdFiscaleIVA.IdPaese.upper()
+            id_codice = re.sub(r"\W+", "", DatiAnagrafici.IdFiscaleIVA.IdCodice).upper()
+            # Format Italian VAT ID to always have 11 char
+            # to avoid validation error when creating the given partner
+            if id_paese == "IT" and not id_codice.startswith("IT"):
+                vat = "IT{}".format(id_codice.rjust(11, "0")[:11])
+            # XXX maybe San Marino needs special formatting too?
+            else:
+                vat = id_codice
         return cf, vat
 
     def _prepare_partner_values(self, DatiAnagrafici, vat=False, cf=False):
@@ -1868,6 +1885,8 @@ def _process_fatturapa_attachment(self, fatturapa_attachments):
                                     "invoice_id": invoice.id,
                                 }
                             )
+                        elif isinstance(partner, bool):
+                            invoice.write({"intermediary": False})
                     else:
                         new_intermediary_data.append(
                             {
@@ -1977,18 +1996,3 @@ def importFatturaPA(self):
             "type": "ir.actions.act_window",
             "domain": [("id", "in", new_invoices)],
         }
-
-    def extract_vat(self, DatiAnagrafici):
-        """Extract VAT from node DatiAnagrafici."""
-        vat = False
-        if DatiAnagrafici.IdFiscaleIVA:
-            id_paese = DatiAnagrafici.IdFiscaleIVA.IdPaese.upper()
-            id_codice = re.sub(r"\W+", "", DatiAnagrafici.IdFiscaleIVA.IdCodice).upper()
-            # Format Italian VAT ID to always have 11 char
-            # to avoid validation error when creating the given partner
-            if id_paese == "IT" and not id_codice.startswith("IT"):
-                vat = "IT{}".format(id_codice.rjust(11, "0")[:11])
-            # XXX maybe San Marino needs special formatting too?
-            else:
-                vat = id_codice
-        return vat