diff --git a/ssi_l10n_id_taxform_faktur_pajak/__manifest__.py b/ssi_l10n_id_taxform_faktur_pajak/__manifest__.py
index 5497b46..7fa42ae 100644
--- a/ssi_l10n_id_taxform_faktur_pajak/__manifest__.py
+++ b/ssi_l10n_id_taxform_faktur_pajak/__manifest__.py
@@ -20,6 +20,7 @@
         "ssi_transaction_open_mixin",
         "ssi_transaction_confirm_mixin",
         "ssi_transaction_partner_mixin",
+        "ssi_transaction_tax_address_mixin",
         "ssi_transaction_total_mixin",
         "ssi_company_currency_mixin",
         "ssi_accounting_entry_mixin",
diff --git a/ssi_l10n_id_taxform_faktur_pajak/models/faktur_pajak_keluaran.py b/ssi_l10n_id_taxform_faktur_pajak/models/faktur_pajak_keluaran.py
index 09226ae..6490929 100644
--- a/ssi_l10n_id_taxform_faktur_pajak/models/faktur_pajak_keluaran.py
+++ b/ssi_l10n_id_taxform_faktur_pajak/models/faktur_pajak_keluaran.py
@@ -18,6 +18,7 @@ class FakturPajakKeluaran(models.Model):
         "mixin.transaction_open",
         "mixin.transaction_confirm",
         "mixin.transaction_partner",
+        "mixin.transaction_tax_address",
         "mixin.transaction_untaxed_with_field",
         "mixin.transaction_total_with_field",
         "mixin.transaction_tax_with_field",
@@ -366,8 +367,8 @@ def _compute_efaktur_alamat_lengkap(self):
             result = "-"
             if record.partner_id:
                 result = ""
-                if record.contact_partner_id:
-                    partner = record.contact_partner_id
+                if record.tax_address_id:
+                    partner = record.tax_address_id
                 else:
                     partner = record.partner_id
 
diff --git a/ssi_l10n_id_taxform_faktur_pajak/views/faktur_pajak_keluaran_views.xml b/ssi_l10n_id_taxform_faktur_pajak/views/faktur_pajak_keluaran_views.xml
index 2b9cdcd..54c684c 100644
--- a/ssi_l10n_id_taxform_faktur_pajak/views/faktur_pajak_keluaran_views.xml
+++ b/ssi_l10n_id_taxform_faktur_pajak/views/faktur_pajak_keluaran_views.xml
@@ -87,7 +87,22 @@
                 <field name="company_currency_id" invisible="1" />
                 <field name="currency_id" invisible="1" />
                 <field name="type_id" />
-                <field name="partner_id" widget="many2one_avatar" />
+                <field
+                        name="partner_id"
+                        context="{'show_address': 1, 'show_vat': True}"
+                        options='{"always_reload": True}'
+                    />
+                <field
+                        name="allowed_tax_address_ids"
+                        widget="many2many_avatar"
+                        invisible="1"
+                    />
+                <field
+                        name="tax_address_id"
+                        domain="[('id','in',allowed_tax_address_ids)]"
+                        context="{'show_address': 1}"
+                        options='{"always_reload": True}'
+                    />
                 <field
                         name="allowed_contact_ids"
                         widget="many2many_avatar"