[IMP] account_avatax_oca: support addresses with only Lat/Long coords

OCA · Jun 4, 2024 · 3ed14a9 · 3ed14a9
1 parent c816411
commit 3ed14a9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/account_avatax_oca/models/avatax_rest_api.py b/account_avatax_oca/models/avatax_rest_api.py
@@ -263,20 +263,8 @@ def get_tax(
             doc_date = fields.Date.to_string(doc_date)
         create_transaction = {
             "addresses": {
-                "shipFrom": {
-                    "city": origin.city,
-                    "country": origin.country_id.code or None,
-                    "line1": origin.street or None,
-                    "postalCode": origin.zip,
-                    "region": origin.state_id.code or None,
-                },
-                "shipTo": {
-                    "city": destination.city,
-                    "country": destination.country_id.code or None,
-                    "line1": destination.street or None,
-                    "postalCode": destination.zip,
-                    "region": destination.state_id.code or None,
-                },
+                "shipFrom": origin.get_avatax_address(),
+                "shipTo": destination.get_avatax_address(),
             },
             "lines": lineslist,
             # 'purchaseOrderNo": "2020-02-05-001"
@@ -295,6 +283,7 @@ def get_tax(
             "type": doc_type,
             "commit": commit,
         }
+
         if is_override and invoice_date:
             create_transaction.update(
                 {

diff --git a/account_avatax_oca/models/partner.py b/account_avatax_oca/models/partner.py
@@ -156,6 +156,25 @@ def get_valid_address_vals(self, validation_on_save=False):
         )
         return valid_address
 
+    def get_avatax_address(self):
+        # Format an address according to Avatax API for CreateTransaction
+        # https://developer.avalara.com
+        # /api-reference/avatax/rest/v2/models/AddressLocationInfo/
+        if self.partner_latitude or self.partner_longitude:
+            res = {
+                "latitude": self.partner_latitude,
+                "longitude": self.partner_longitude,
+            }
+        else:
+            res = {
+                "city": self.city,
+                "country": self.country_id.code or None,
+                "line1": self.street or None,
+                "postalCode": self.zip,
+                "region": self.state_id.code or None,
+            }
+        return res
+
     def multi_address_validation(self, validation_on_save=False):
         for partner in self:
             if not (partner.parent_id and partner.type == "contact"):
@@ -202,10 +221,8 @@ def create(self, vals_list):
 
     def write(self, vals):
         res = super(ResPartner, self).write(vals)
-        address_fields = ["street", "street2", "city", "zip", "state_id", "country_id"]
-        if not self.env.context.get("avatax_writing") and any(
-            x in vals for x in address_fields
-        ):
+        has_address = any(vals.get(x) for x in ["street", "street2", "city", "zip"])
+        if has_address and not self.env.context.get("avatax_writing"):
             partner = self.with_context(avatax_writing=True)
             avatax_config = self.env.company.get_avatax_config_company()
             if avatax_config.validation_on_save: