[IMP] account_invoice_edifact: update address export

Author: thienvh332

account_invoice_edifact/models/account_move.py

@@ -40,8 +40,20 @@ def _edifact_invoice_get_interchange(self):
             sender_edifact, recipient_edifact, self.id, syntax_identifier
         )
 
+    def _edifact_invoice_get_address(self, partner):
+        # We apply the same logic as:
+        # https://github.com/OCA/edi/blob/
+        # c41829a8d986c6751c07299807c808d15adbf4db/base_ubl/models/ubl.py#L39
+
+        # oca/partner-contact/partner_address_street3 is installed
+        if hasattr(partner, "street3"):
+            return partner.street3 or partner.street2 or partner.street
+        else:
+            return partner.street2 or partner.street
+
     def _edifact_invoice_get_buyer(self):
         buyer = self.partner_id
+        street = self._edifact_invoice_get_address(buyer)
         return [
             # Invoice information
             (
@@ -50,7 +62,7 @@ def _edifact_invoice_get_buyer(self):
                 [buyer.id, "", "92"],
                 "",
                 buyer.commercial_company_name,
-                [buyer.street, ""],
+                [street, ""],
                 buyer.city,
                 "",
                 buyer.zip,
@@ -78,6 +90,7 @@ def _edifact_invoice_get_seller(self):
         id_number = self.env["res.partner.id_number"]
         seller = self.invoice_user_id.partner_id
         seller_id_number = id_number.search([("partner_id", "=", seller.id)], limit=1)
+        street = self._edifact_invoice_get_address(seller)
         return [
             # Seller information
             (
@@ -86,7 +99,7 @@ def _edifact_invoice_get_seller(self):
                 [seller_id_number.name, "", "92"],
                 "",
                 seller.commercial_company_name,
-                [seller.street, ""],
+                [street, ""],
                 seller.city,
                 "",
                 seller.zip,

account_invoice_edifact/tests/test_account_move.py

@@ -79,3 +79,15 @@ def test_edifact_invoice_get_summary(self):
         vals = {"tax": {0: 533.72}, "total_line_item": 2}
         segments = self.invoice._edifact_invoice_get_summary(vals)
         self.assertEqual(len(segments), 9)
+
+    def test_edifact_invoice_get_address(self):
+        partner = self.invoice.partner_id
+        if hasattr(partner, "street3"):
+            partner.street3 = "Address"
+            self.assertEqual(
+                self.invoice._edifact_invoice_get_address(partner), partner.street3
+            )
+        else:
+            self.assertEqual(
+                self.invoice._edifact_invoice_get_address(partner), partner.street
+            )