diff --git a/ssi_l10n_id_taxform_faktur_pajak/__manifest__.py b/ssi_l10n_id_taxform_faktur_pajak/__manifest__.py
index 26abcf5..c79a11f 100644
--- a/ssi_l10n_id_taxform_faktur_pajak/__manifest__.py
+++ b/ssi_l10n_id_taxform_faktur_pajak/__manifest__.py
@@ -29,6 +29,7 @@
         "security/ir_module_category_data.xml",
         "security/res_group_data.xml",
         "security/ir.model.access.csv",
+        "security/ir_rule_data.xml",
         "data/ir_sequence_data.xml",
         "data/sequence_template_data.xml",
         "data/approval_template_data.xml",
diff --git a/ssi_l10n_id_taxform_faktur_pajak/data/account_journal_data.xml b/ssi_l10n_id_taxform_faktur_pajak/data/account_journal_data.xml
deleted file mode 100644
index 64ac3b6..0000000
--- a/ssi_l10n_id_taxform_faktur_pajak/data/account_journal_data.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2022 OpenSynergy Indonesia
-     Copyright 2022 PT. Simetri Sinergi Indonesia
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-<odoo>
-<data noupdate="1">
-<record id="journal_p2126o" model="account.journal">
-    <field name="name">PPh 21/26 Out</field>
-    <field name="code">P2126O</field>
-    <field name="type">general</field>
-</record>
-</data>
-</odoo>
diff --git a/ssi_l10n_id_taxform_faktur_pajak/security/ir_rule_data.xml b/ssi_l10n_id_taxform_faktur_pajak/security/ir_rule_data.xml
index 1c53e8d..ba399f2 100644
--- a/ssi_l10n_id_taxform_faktur_pajak/security/ir_rule_data.xml
+++ b/ssi_l10n_id_taxform_faktur_pajak/security/ir_rule_data.xml
@@ -4,9 +4,9 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
 
-<record id="l10n_id_bukti_potong_pph_f113301_out_internal_user_rule" model="ir.rule">
-    <field name="name">Bukti Potong PPh f113301 Out - Internal Users</field>
-    <field name="model_id" ref="model_l10n_id_bukti_potong_pph_f113301_out" />
+<record id="enofa_internal_user_rule" model="ir.rule">
+    <field name="name">E-NOFA - Internal Users</field>
+    <field name="model_id" ref="model_enofa" />
     <field name="groups" eval="[(4, ref('base.group_user'))]" />
     <field name="domain_force">[
       ('user_id','=',user.id),
@@ -17,15 +17,23 @@
     <field name="perm_create" eval="1" />
 </record>
 
-<record id="l10n_id_bukti_potong_pph_f113301_out_company_rule" model="ir.rule">
+<record id="enofa_company_rule" model="ir.rule">
+    <field name="name">E-NOFA - Responsible to company data</field>
+    <field name="model_id" ref="model_enofa" />
+    <field name="groups" eval="[(4, ref('enofa_company_group'))]" />
+    <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+    <field name="perm_unlink" eval="1" />
+    <field name="perm_write" eval="1" />
+    <field name="perm_read" eval="1" />
+    <field name="perm_create" eval="1" />
+</record>
+
+<record id="enofa_companies_rule" model="ir.rule">
     <field
             name="name"
-        >Bukti Potong PPh f113301 Out - Responsible to company data</field>
-    <field name="model_id" ref="model_l10n_id_bukti_potong_pph_f113301_out" />
-    <field
-            name="groups"
-            eval="[(4, ref('l10n_id_bukti_potong_pph_f113301_out_company_group'))]"
-        />
+        >E-NOFA - Responsible to company and all child companies data</field>
+    <field name="model_id" ref="model_enofa" />
+    <field name="groups" eval="[(4, ref('enofa_companies_group'))]" />
     <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
     <field name="perm_unlink" eval="1" />
     <field name="perm_write" eval="1" />
@@ -33,15 +41,47 @@
     <field name="perm_create" eval="1" />
 </record>
 
-<record id="l10n_id_bukti_potong_pph_f113301_out_companies_rule" model="ir.rule">
+<record id="enofa_all_rule" model="ir.rule">
+    <field name="name">E-NOFA - All</field>
+    <field name="model_id" ref="model_enofa" />
+    <field name="groups" eval="[(4, ref('enofa_all_group'))]" />
+    <field name="domain_force">[(1,'=',1)]</field>
+    <field name="perm_unlink" eval="1" />
+    <field name="perm_write" eval="1" />
+    <field name="perm_read" eval="1" />
+    <field name="perm_create" eval="1" />
+</record>
+
+<record id="faktur_pajak_keluaran_internal_user_rule" model="ir.rule">
+    <field name="name">E-NOFA - Internal Users</field>
+    <field name="model_id" ref="model_faktur_pajak_keluaran" />
+    <field name="groups" eval="[(4, ref('base.group_user'))]" />
+    <field name="domain_force">[
+      ('user_id','=',user.id),
+    ]</field>
+    <field name="perm_unlink" eval="1" />
+    <field name="perm_write" eval="1" />
+    <field name="perm_read" eval="1" />
+    <field name="perm_create" eval="1" />
+</record>
+
+<record id="faktur_pajak_keluaran_company_rule" model="ir.rule">
+    <field name="name">E-NOFA - Responsible to company data</field>
+    <field name="model_id" ref="model_faktur_pajak_keluaran" />
+    <field name="groups" eval="[(4, ref('faktur_pajak_keluaran_company_group'))]" />
+    <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+    <field name="perm_unlink" eval="1" />
+    <field name="perm_write" eval="1" />
+    <field name="perm_read" eval="1" />
+    <field name="perm_create" eval="1" />
+</record>
+
+<record id="faktur_pajak_keluaran_companies_rule" model="ir.rule">
     <field
             name="name"
-        >Bukti Potong PPh f113301 Out - Responsible to company and all child companies data</field>
-    <field name="model_id" ref="model_l10n_id_bukti_potong_pph_f113301_out" />
-    <field
-            name="groups"
-            eval="[(4, ref('l10n_id_bukti_potong_pph_f113301_out_companies_group'))]"
-        />
+        >E-NOFA - Responsible to company and all child companies data</field>
+    <field name="model_id" ref="model_faktur_pajak_keluaran" />
+    <field name="groups" eval="[(4, ref('faktur_pajak_keluaran_companies_group'))]" />
     <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
     <field name="perm_unlink" eval="1" />
     <field name="perm_write" eval="1" />
@@ -49,18 +89,14 @@
     <field name="perm_create" eval="1" />
 </record>
 
-<record id="l10n_id_bukti_potong_pph_f113301_out_all_rule" model="ir.rule">
-    <field name="name">Bukti Potong PPh f113301 Out - All</field>
-    <field name="model_id" ref="model_l10n_id_bukti_potong_pph_f113301_out" />
-    <field
-            name="groups"
-            eval="[(4, ref('l10n_id_bukti_potong_pph_f113301_out_all_group'))]"
-        />
+<record id="faktur_pajak_keluaran_all_rule" model="ir.rule">
+    <field name="name">E-NOFA - All</field>
+    <field name="model_id" ref="model_faktur_pajak_keluaran" />
+    <field name="groups" eval="[(4, ref('faktur_pajak_keluaran_all_group'))]" />
     <field name="domain_force">[(1,'=',1)]</field>
     <field name="perm_unlink" eval="1" />
     <field name="perm_write" eval="1" />
     <field name="perm_read" eval="1" />
     <field name="perm_create" eval="1" />
 </record>
-
 </odoo>