From b54f8ecbc2a4f150aae92253ffcfc8528f198411 Mon Sep 17 00:00:00 2001
From: Tobias Kunze <r@rixx.de>
Date: Wed, 4 Jun 2025 11:06:32 +0200
Subject: [PATCH] Remove VAT field

---
 src/servala/core/models/organization.py                     | 4 +---
 src/servala/frontend/forms/organization.py                  | 1 -
 .../frontend/templates/frontend/organizations/create.html   | 2 --
 .../frontend/templates/frontend/organizations/update.html   | 6 ------
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/servala/core/models/organization.py b/src/servala/core/models/organization.py
index 2a90464..4b9b435 100644
--- a/src/servala/core/models/organization.py
+++ b/src/servala/core/models/organization.py
@@ -154,8 +154,6 @@ class BillingEntity(ServalaModelMixin, models.Model):
             "name": odoo_data.get("company_name", name),
             "company_type": "company",
         }
-        if vat := odoo_data.get("invoice_vat"):
-            company_payload["vat"] = vat
         company_id = CLIENT.execute("res.partner", "create", [company_payload])
         instance.odoo_company_id = company_id
 
@@ -199,7 +197,7 @@ class BillingEntity(ServalaModelMixin, models.Model):
             "invoice_address": None,
         }
 
-        company_fields = ["name", "company_type", "vat"]
+        company_fields = ["name", "company_type"]
         invoice_address_fields = [
             "name",
             "company_type",
diff --git a/src/servala/frontend/forms/organization.py b/src/servala/frontend/forms/organization.py
index b08c2f7..37a2a35 100644
--- a/src/servala/frontend/forms/organization.py
+++ b/src/servala/frontend/forms/organization.py
@@ -40,7 +40,6 @@ class OrganizationCreateForm(OrganizationForm):
     )
     invoice_email = forms.EmailField(label=_("Billing Email"), required=False)
     invoice_phone = forms.CharField(label=_("Phone"), required=False, max_length=30)
-    invoice_vat = forms.CharField(label=_("VAT ID"), required=False, max_length=50)
 
     class Meta(OrganizationForm.Meta):
         pass
diff --git a/src/servala/frontend/templates/frontend/organizations/create.html b/src/servala/frontend/templates/frontend/organizations/create.html
index 4fcdc7e..ae409d3 100644
--- a/src/servala/frontend/templates/frontend/organizations/create.html
+++ b/src/servala/frontend/templates/frontend/organizations/create.html
@@ -42,8 +42,6 @@
                         </div>
                         <div class="form-body card-body">
                             <div class="row">
-                                {{ form.invoice_vat.as_field_group }}
-                                <hr>
                                 {{ form.invoice_street.as_field_group }}
                                 {{ form.invoice_street2.as_field_group }}
                                 <div class="col-md-2">{{ form.invoice_zip.as_field_group }}</div>
diff --git a/src/servala/frontend/templates/frontend/organizations/update.html b/src/servala/frontend/templates/frontend/organizations/update.html
index 384d5a5..97d266d 100644
--- a/src/servala/frontend/templates/frontend/organizations/update.html
+++ b/src/servala/frontend/templates/frontend/organizations/update.html
@@ -116,12 +116,6 @@
                                                     </th>
                                                     <td>{{ odoo_data.invoice_address.country_id.1|default:"" }}</td>
                                                 </tr>
-                                                <tr>
-                                                    <th class="w-25">
-                                                        <span class="d-flex mt-2">{% translate "VAT ID" %}</span>
-                                                    </th>
-                                                    <td>{{ odoo_data.company.vat|default:"" }}</td>
-                                                </tr>
                                                 <th class="w-25">
                                                     <span class="d-flex mt-2">{% translate "Invoice Email" %}</span>
                                                 </th>