diff --git a/Privacy Policy.md b/Privacy Policy.md
new file mode 100644
index 0000000..88f58a8
--- /dev/null
+++ b/Privacy Policy.md	
@@ -0,0 +1,53 @@
+**Privacy Policy**
+
+**Navari Limited** ("Company", "we", "us", or "our") is committed to protecting your privacy. This Privacy Policy explains how we collect, use, disclose, and safeguard your information when you use our services, including our website [Navari Limted](https://navari.co.ke/), our application (Burundi Compliance App), and any other related services that link to this Privacy Policy.
+
+**1. Information We Collect**
+
+**Personal Information You Provide:** We collect personal information you provide when you interact with our services, or contact us. This includes:
+
+-   **Login Credentials:** username and password required for accessing OBR (Office Burundais des Recettes) services.
+
+**Automatically Collected Information:** We don't collect information about your device and usage of our services. We only collect the necessary information to be sent to OBR, either from stock or invoices.
+
+**2. How We Use Your Information**
+
+We process your information to:
+
+-   **Provide and Manage Services:** We provide you with our compliance services.
+-   **Compliance and Legal Requirements:** Ensure adherence to tax regulations by processing and transmitting data to OBR.
+
+**3. Information Sharing**
+
+We may share your information:
+
+-   **With OBR:** To fulfill the legal requirements of tax compliance, such as sending sales invoices and tracking stock movements.
+-   **With Third-Party Service Providers:** For services such as server maintenance. These providers are bound by confidentiality agreements and are not permitted to use your information for any purpose other than providing services to us.
+-   **In Case of Business Transfers:** If Navari Limited is involved in a merger, sale, or acquisition, your information may be transferred as part of that transaction.
+
+**4. Data Retention**
+
+We retain your personal information for as long as necessary to fulfil the purposes outlined in this privacy policy unless a longer retention period is required or permitted by law. Once the retention period expires, your data will be deleted or anonymized.
+
+**5. Security of Your Information**
+
+We implement organizational and technical security measures to protect your data. However, no method of transmission over the Internet or electronic storage is 100% secure. We cannot guarantee the absolute security of your information.
+
+**6. Minors**
+
+Our services are not intended for individuals under 18 years of age. We do not knowingly collect personal information from children under 18. If we discover that we have inadvertently gathered such data, we will take immediate steps to delete it.
+
+**7. Your Privacy Rights**
+
+You may review, update, or delete your personal information at any time by uninstalling the app from your site.
+
+**8. Do-Not-Track Features**
+
+We do not currently respond to Do-Not-Track signals or any other mechanism that allows consumers to opt out of tracking on the web.
+
+**9. Contact Us**
+
+If you have any questions or concerns about this privacy policy, please contact us at:
+
+**Navari Limited**  
+Email: solutions@navari.co.ke  
diff --git a/Terms and Conditions.md b/Terms and Conditions.md
new file mode 100644
index 0000000..fb65d92
--- /dev/null
+++ b/Terms and Conditions.md	
@@ -0,0 +1,52 @@
+## Terms and Conditions of Service**
+
+**1. Introduction**
+
+Welcome to Burundi Compliance, a service provided by Navari Limited ("Company", "we", "our", or "us"). By using our service, you agree to be bound by the following terms and conditions ("Terms of Service", "Terms"). Please read these terms carefully before using our service.
+
+**2. Acceptance of Terms**
+
+By accessing or using Burundi Compliance, you agree to comply with and be bound by these Terms. If you do not agree to these Terms, you must not access or use our service.
+
+**3. Changes to Terms**
+
+We reserve the right to modify these Terms at any time. Any changes will be effective immediately upon posting to our website or service. Your continued use of the service following any such changes constitutes your acceptance of the new Terms.
+
+**4. Service Description**
+
+Burundi Compliance is an open-source project designed to assist businesses in complying with regulatory requirements specific to Burundi. The service may include, but is not limited to, tools, documentation, and software that help with compliance management.
+
+**5. User Responsibilities**
+
+-   You are responsible for ensuring that your use of Burundi Compliance complies with all applicable laws and regulations.
+-   You must not use the service for any illegal or unauthorized purpose.
+-   You agree not to reproduce, duplicate, copy, sell, resell, or exploit any portion of the service without express written permission from Navari Limited.
+
+**6. Intellectual Property**
+
+All content, including but not limited to software, documentation, graphics, and logos associated with Burundi Compliance, is the property of Navari Limited or its licensors and is protected by intellectual property laws. Unauthorized use of such content is prohibited.
+
+**7. Data Privacy**
+
+We respect your privacy and are committed to protecting your personal information. Please review our [Privacy Policy](https://github.com/navariltd/burundi-compliance/blob/develop/Privacy%20Policy.md), which outlines how we collect, use, and safeguard your data.
+
+**8. Limitation of Liability**
+
+Navari Limited shall not be liable for any direct, indirect, incidental, special, or consequential damages arising out of or in connection with your use of Burundi Compliance. This includes, but is not limited to, any loss of data, profits, or business opportunities.
+
+**9. Termination**
+
+We reserve the right to suspend or terminate your access to Burundi Compliance at any time, with or without cause, and with or without notice. Upon termination, you must cease all use of the service and delete any copies of the software or materials you have obtained through the service.
+
+**10. Governing Law**
+
+These Terms are governed by and construed in accordance with the laws of Burundi. Any disputes arising under these Terms shall be subject to the exclusive jurisdiction of the courts of Burundi.
+
+**11. Contact Information**
+
+If you have any questions or concerns regarding these Terms, please contact us at:
+
+Navari Limited  
+7th Floor, Block I Eden Square Complex, Chiromo Road.  
+P.O Box 856-00606 Nairobi, Kenya
+Email: solutions@navari.co.ke  
diff --git a/burundi_compliance/burundi_compliance/client_scripts/customer_supplier_check_tin.js b/burundi_compliance/burundi_compliance/client_scripts/customer_supplier_check_tin.js
index 54dcc1a..eec2287 100644
--- a/burundi_compliance/burundi_compliance/client_scripts/customer_supplier_check_tin.js
+++ b/burundi_compliance/burundi_compliance/client_scripts/customer_supplier_check_tin.js
@@ -46,19 +46,52 @@ function showInvoiceDetailsDialog(result, doctype) {
     dialog.show();
 }
 
+
+function set_gst_category_query(frm) {
+    if (frm.doc.customer_type||frm.doc.supplier_type === 'Company') {
+        frm.set_query('custom_gst_category', function() {
+            return {
+                filters: {
+                    'name': ['!=', 'Unregistered']
+                }
+            };
+        });
+    } else {
+        frm.set_query('custom_gst_category', function() {
+            return {
+                filters: {
+                    'name': ['!=', 'UN']
+                }
+            };
+        });
+    }
+}
+
 frappe.ui.form.on('Customer', {
-    refresh: function(frm){
-        get_tin(frm)
-    }})
+    refresh: function(frm) {
+        get_tin(frm);
+        set_gst_category_query(frm);
+    },
+    customer_type: function(frm) {
+        set_gst_category_query(frm);
+    }
+});
 
 frappe.ui.form.on('Supplier', {
    
         refresh: function(frm){
             get_tin(frm)
-        }})
+            set_gst_category_query(frm);
+        },
+        supplier_type: function(frm) {
+            set_gst_category_query(frm);
+        }
+    
+    })
 
 frappe.ui.form.on('Company', {
 
     refresh: function(frm){
         get_tin(frm)
-    }})
\ No newline at end of file
+    }})
+
diff --git a/burundi_compliance/burundi_compliance/custom/customer.json b/burundi_compliance/burundi_compliance/custom/customer.json
index b1ab575..0a279bf 100644
--- a/burundi_compliance/burundi_compliance/custom/customer.json
+++ b/burundi_compliance/burundi_compliance/custom/customer.json
@@ -11,7 +11,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-03-04 07:57:17.787225",
+   "creation": "2024-07-06 16:04:12.828278",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -19,32 +19,33 @@
    "dt": "Customer",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_tin_verified",
-   "fieldtype": "Check",
+   "fieldname": "custom_gst_category",
+   "fieldtype": "Link",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 50,
+   "idx": 56,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "tax_id",
+   "insert_after": "custom_tin_details",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "Tin Verified",
+   "label": "GST Category",
    "length": 0,
+   "link_filters": null,
    "mandatory_depends_on": null,
-   "modified": "2024-03-04 07:57:17.787225",
+   "modified": "2024-07-06 16:04:12.828278",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Customer-custom_tin_verified",
+   "name": "Customer-custom_gst_category",
    "no_copy": 0,
    "non_negative": 0,
-   "options": null,
+   "options": "GST Category",
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -73,7 +74,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-02-24 11:17:35.326653",
+   "creation": "2024-07-06 16:04:12.647312",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -81,32 +82,33 @@
    "dt": "Customer",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_gst_category",
-   "fieldtype": "Select",
+   "fieldname": "custom_tin_details",
+   "fieldtype": "Section Break",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 56,
+   "idx": 55,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_tin_details",
+   "insert_after": "tax_withholding_category",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "GST Category",
+   "label": "TIN Details",
    "length": 0,
+   "link_filters": null,
    "mandatory_depends_on": null,
-   "modified": "2024-02-24 11:17:35.326653",
+   "modified": "2024-07-06 16:04:12.647312",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Customer-custom_gst_category",
+   "name": "Customer-custom_tin_details",
    "no_copy": 0,
    "non_negative": 0,
-   "options": "\nRegistered\nUnregistered\nOversees\nDeemed export\nUIN Holders\nTax Deductors",
+   "options": null,
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -116,11 +118,11 @@
    "read_only": 0,
    "read_only_depends_on": null,
    "report_hide": 0,
-   "reqd": 1,
+   "reqd": 0,
    "search_index": 0,
    "show_dashboard": 0,
    "sort_options": 0,
-   "translatable": 1,
+   "translatable": 0,
    "unique": 0,
    "width": null
   },
@@ -135,7 +137,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-02-24 11:17:35.097065",
+   "creation": "2024-03-04 07:57:17.787225",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -143,29 +145,30 @@
    "dt": "Customer",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_tin_details",
-   "fieldtype": "Section Break",
+   "fieldname": "custom_tin_verified",
+   "fieldtype": "Check",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 55,
+   "idx": 51,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "tax_withholding_category",
+   "insert_after": "tax_id",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "TIN Details",
+   "label": "Tin Verified",
    "length": 0,
+   "link_filters": null,
    "mandatory_depends_on": null,
-   "modified": "2024-02-24 11:17:35.097065",
+   "modified": "2024-03-04 07:57:17.787225",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Customer-custom_tin_details",
+   "name": "Customer-custom_tin_verified",
    "no_copy": 0,
    "non_negative": 0,
    "options": null,
@@ -223,6 +226,7 @@
    "is_virtual": 0,
    "label": "Is customer exempted from sales tax?",
    "length": 0,
+   "link_filters": null,
    "mandatory_depends_on": null,
    "modified": "2024-02-15 23:49:13.094826",
    "modified_by": "Administrator",
@@ -285,6 +289,7 @@
    "is_virtual": 0,
    "label": "Is NPA",
    "length": 0,
+   "link_filters": null,
    "mandatory_depends_on": null,
    "modified": "2024-02-15 01:03:09.532480",
    "modified_by": "Administrator",
@@ -347,6 +352,7 @@
    "is_virtual": 0,
    "label": "Loan Details",
    "length": 0,
+   "link_filters": null,
    "mandatory_depends_on": null,
    "modified": "2024-02-15 01:03:09.527109",
    "modified_by": "Administrator",
@@ -373,328 +379,7 @@
    "width": null
   }
  ],
- "custom_perms": [
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-06-11 14:26:44",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 1,
-   "export": 0,
-   "idx": 3,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:12.331916",
-   "modified_by": "Administrator",
-   "name": "9caeca0bad",
-   "owner": "Administrator",
-   "parent": "Customer",
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Manager",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "creation": "2013-06-11 14:26:44",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 1,
-   "export": 0,
-   "idx": 1,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:12.337070",
-   "modified_by": "Administrator",
-   "name": "060ef63123",
-   "owner": "Administrator",
-   "parent": "Customer",
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales User",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
-   "write": 1
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-06-11 14:26:44",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 1,
-   "export": 0,
-   "idx": 9,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:12.341977",
-   "modified_by": "Administrator",
-   "name": "19a3078fe3",
-   "owner": "Administrator",
-   "parent": "Customer",
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-06-11 14:26:44",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 0,
-   "export": 0,
-   "idx": 2,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:12.347703",
-   "modified_by": "Administrator",
-   "name": "1371c7490a",
-   "owner": "Administrator",
-   "parent": "Customer",
-   "permlevel": 1,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Sales User",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-06-11 14:26:44",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 1,
-   "export": 0,
-   "idx": 8,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:12.352640",
-   "modified_by": "Administrator",
-   "name": "25f02854bc",
-   "owner": "Administrator",
-   "parent": "Customer",
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "creation": "2013-06-11 14:26:44",
-   "delete": 1,
-   "docstatus": 0,
-   "email": 1,
-   "export": 1,
-   "idx": 4,
-   "if_owner": 0,
-   "import": 1,
-   "modified": "2023-12-14 14:19:12.357593",
-   "modified_by": "Administrator",
-   "name": "6bbda0e76d",
-   "owner": "Administrator",
-   "parent": "Customer",
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Master Manager",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
-   "write": 1
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-06-11 14:26:44",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 0,
-   "export": 0,
-   "idx": 5,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:12.364630",
-   "modified_by": "Administrator",
-   "name": "3796d08f0e",
-   "owner": "Administrator",
-   "parent": "Customer",
-   "permlevel": 1,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Sales Master Manager",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 1
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-06-11 14:26:44",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 1,
-   "export": 0,
-   "idx": 7,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:12.369440",
-   "modified_by": "Administrator",
-   "name": "211bfd147c",
-   "owner": "Administrator",
-   "parent": "Customer",
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Stock Manager",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-06-11 14:26:44",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 1,
-   "export": 0,
-   "idx": 6,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:12.374806",
-   "modified_by": "Administrator",
-   "name": "41dbe24a91",
-   "owner": "Administrator",
-   "parent": "Customer",
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Stock User",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2023-12-14 14:19:12.381176",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 0,
-   "export": 1,
-   "idx": 0,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:12.410810",
-   "modified_by": "Administrator",
-   "name": "f6a8edd3db",
-   "owner": "Administrator",
-   "parent": "Customer",
-   "permlevel": 0,
-   "print": 0,
-   "read": 0,
-   "report": 0,
-   "role": "Employee Self Service",
-   "select": 1,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  }
- ],
+ "custom_perms": [],
  "doctype": "Customer",
  "links": [
   {
@@ -707,9 +392,9 @@
    "is_child_table": 0,
    "link_doctype": "Party Specific Item",
    "link_fieldname": "party",
-   "modified": "2024-01-03 20:44:30.528451",
+   "modified": "2024-06-01 17:18:29.915358",
    "modified_by": "Administrator",
-   "name": "d8cbecba70",
+   "name": "0ldr635fru",
    "owner": "Administrator",
    "parent": "Customer",
    "parent_doctype": null,
@@ -724,7 +409,7 @@
    "_comments": null,
    "_liked_by": null,
    "_user_tags": null,
-   "creation": "2024-03-04 07:57:17.667678",
+   "creation": "2024-07-06 16:05:56.869334",
    "default_value": null,
    "doc_type": "Customer",
    "docstatus": 0,
@@ -732,7 +417,7 @@
    "field_name": null,
    "idx": 0,
    "is_system_generated": 0,
-   "modified": "2024-03-04 07:57:17.667678",
+   "modified": "2024-07-06 16:05:56.869334",
    "modified_by": "Administrator",
    "module": null,
    "name": "Customer-main-field_order",
@@ -740,30 +425,30 @@
    "property": "field_order",
    "property_type": "Data",
    "row_name": null,
-   "value": "[\"basic_info\", \"naming_series\", \"salutation\", \"customer_name\", \"customer_type\", \"customer_group\", \"column_break0\", \"territory\", \"gender\", \"lead_name\", \"opportunity_name\", \"account_manager\", \"image\", \"defaults_tab\", \"default_currency\", \"default_bank_account\", \"column_break_14\", \"default_price_list\", \"internal_customer_section\", \"is_internal_customer\", \"represents_company\", \"column_break_70\", \"companies\", \"more_info\", \"market_segment\", \"industry\", \"customer_pos_id\", \"website\", \"language\", \"column_break_45\", \"customer_details\", \"dashboard_tab\", \"contact_and_address_tab\", \"address_contacts\", \"address_html\", \"column_break1\", \"contact_html\", \"primary_address_and_contact_detail\", \"column_break_26\", \"customer_primary_address\", \"primary_address\", \"column_break_nwor\", \"customer_primary_contact\", \"mobile_no\", \"email_id\", \"loan_details_tab\", \"is_npa\", \"tax_tab\", \"taxation_section\", \"tax_id\", \"tin_verified\", \"column_break_21\", \"tax_category\", \"tax_withholding_category\", \"custom_tin_details\", \"custom_gst_category\", \"accounting_tab\", \"credit_limit_section\", \"payment_terms\", \"credit_limits\", \"default_receivable_accounts\", \"accounts\", \"loyalty_points_tab\", \"loyalty_program\", \"column_break_54\", \"loyalty_program_tier\", \"sales_team_tab\", \"sales_team\", \"sales_team_section\", \"default_sales_partner\", \"column_break_66\", \"default_commission_rate\", \"settings_tab\", \"so_required\", \"dn_required\", \"exempt_from_sales_tax\", \"column_break_53\", \"is_frozen\", \"disabled\", \"portal_users_tab\", \"portal_users\"]"
+   "value": "[\"basic_info\", \"naming_series\", \"salutation\", \"customer_name\", \"customer_type\", \"customer_group\", \"column_break0\", \"territory\", \"gender\", \"lead_name\", \"opportunity_name\", \"account_manager\", \"image\", \"defaults_tab\", \"default_currency\", \"default_bank_account\", \"column_break_14\", \"default_price_list\", \"internal_customer_section\", \"is_internal_customer\", \"represents_company\", \"column_break_70\", \"companies\", \"more_info\", \"market_segment\", \"industry\", \"customer_pos_id\", \"website\", \"language\", \"column_break_45\", \"customer_details\", \"dashboard_tab\", \"contact_and_address_tab\", \"address_contacts\", \"address_html\", \"column_break1\", \"contact_html\", \"primary_address_and_contact_detail\", \"column_break_26\", \"customer_primary_address\", \"primary_address\", \"column_break_nwor\", \"customer_primary_contact\", \"mobile_no\", \"email_id\", \"loan_details_tab\", \"is_npa\", \"tax_tab\", \"taxation_section\", \"tax_id\", \"custom_tin_verified\", \"column_break_21\", \"tax_category\", \"tax_withholding_category\", \"custom_tin_details\", \"custom_gst_category\", \"accounting_tab\", \"credit_limit_section\", \"payment_terms\", \"credit_limits\", \"default_receivable_accounts\", \"accounts\", \"loyalty_points_tab\", \"loyalty_program\", \"column_break_54\", \"loyalty_program_tier\", \"sales_team_tab\", \"sales_team\", \"sales_team_section\", \"default_sales_partner\", \"column_break_66\", \"default_commission_rate\", \"settings_tab\", \"so_required\", \"dn_required\", \"exempt_from_sales_tax\", \"column_break_53\", \"is_frozen\", \"disabled\", \"portal_users_tab\", \"portal_users\"]"
   },
   {
    "_assign": null,
    "_comments": null,
    "_liked_by": null,
    "_user_tags": null,
-   "creation": "2024-03-04 07:35:17.842761",
+   "creation": "2024-02-24 11:24:56.458036",
    "default_value": null,
    "doc_type": "Customer",
    "docstatus": 0,
    "doctype_or_field": "DocField",
-   "field_name": "naming_series",
+   "field_name": "tax_id",
    "idx": 0,
    "is_system_generated": 0,
-   "modified": "2024-03-04 07:35:17.842761",
+   "modified": "2024-07-06 09:44:46.433989",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Customer-naming_series-hidden",
+   "name": "Customer-tax_id-mandatory_depends_on",
    "owner": "Administrator",
-   "property": "hidden",
-   "property_type": "Check",
+   "property": "mandatory_depends_on",
+   "property_type": "Data",
    "row_name": null,
-   "value": "1"
+   "value": "custom_gst_category==\"Registered\""
   },
   {
    "_assign": null,
@@ -778,7 +463,7 @@
    "field_name": "naming_series",
    "idx": 0,
    "is_system_generated": 0,
-   "modified": "2024-03-04 07:35:17.342418",
+   "modified": "2024-07-06 09:44:46.420145",
    "modified_by": "Administrator",
    "module": null,
    "name": "Customer-naming_series-reqd",
@@ -793,23 +478,46 @@
    "_comments": null,
    "_liked_by": null,
    "_user_tags": null,
-   "creation": "2024-02-24 11:24:56.458036",
+   "creation": "2024-03-04 07:35:17.842761",
    "default_value": null,
    "doc_type": "Customer",
    "docstatus": 0,
    "doctype_or_field": "DocField",
-   "field_name": "tax_id",
+   "field_name": "naming_series",
    "idx": 0,
    "is_system_generated": 0,
-   "modified": "2024-02-24 11:24:56.458036",
+   "modified": "2024-07-06 09:44:46.406121",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Customer-tax_id-mandatory_depends_on",
+   "name": "Customer-naming_series-hidden",
    "owner": "Administrator",
-   "property": "mandatory_depends_on",
-   "property_type": "Data",
+   "property": "hidden",
+   "property_type": "Check",
    "row_name": null,
-   "value": "custom_gst_category==\"Registered\""
+   "value": "1"
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "creation": "2024-03-20 19:35:58.329843",
+   "default_value": null,
+   "doc_type": "Customer",
+   "docstatus": 0,
+   "doctype_or_field": "DocField",
+   "field_name": "naming_series",
+   "idx": 0,
+   "is_system_generated": 0,
+   "modified": "2024-03-20 19:35:58.329843",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Customer-naming_series-options",
+   "owner": "Administrator",
+   "property": "options",
+   "property_type": "Text",
+   "row_name": null,
+   "value": "CUST-.YYYY.-"
   }
  ],
  "sync_on_migrate": 1
diff --git a/burundi_compliance/burundi_compliance/custom/supplier.json b/burundi_compliance/burundi_compliance/custom/supplier.json
index f7007a0..3c82480 100644
--- a/burundi_compliance/burundi_compliance/custom/supplier.json
+++ b/burundi_compliance/burundi_compliance/custom/supplier.json
@@ -11,8 +11,8 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-03-04 15:50:57.093130",
-   "default": null,
+   "creation": "2024-07-06 16:12:39.811963",
+   "default": "Registered",
    "depends_on": null,
    "description": null,
    "docstatus": 0,
@@ -20,7 +20,7 @@
    "fetch_from": null,
    "fetch_if_empty": 0,
    "fieldname": "custom_gst_category",
-   "fieldtype": "Select",
+   "fieldtype": "Link",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
@@ -32,19 +32,20 @@
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_section_break_ak8uj",
+   "insert_after": "custom_tin_details",
    "is_system_generated": 0,
    "is_virtual": 0,
    "label": "GST Category",
    "length": 0,
+   "link_filters": null,
    "mandatory_depends_on": null,
-   "modified": "2024-03-04 15:50:57.093130",
+   "modified": "2024-07-06 16:12:39.811963",
    "modified_by": "Administrator",
    "module": null,
    "name": "Supplier-custom_gst_category",
    "no_copy": 0,
    "non_negative": 0,
-   "options": "\nRegistered\nUnregistered\nOversees\nDeemed export\nUIN Holders\nTax Deductors",
+   "options": "GST Category",
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -54,11 +55,11 @@
    "read_only": 0,
    "read_only_depends_on": null,
    "report_hide": 0,
-   "reqd": 1,
+   "reqd": 0,
    "search_index": 0,
    "show_dashboard": 0,
    "sort_options": 0,
-   "translatable": 1,
+   "translatable": 0,
    "unique": 0,
    "width": null
   },
@@ -73,7 +74,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-03-04 15:50:56.854009",
+   "creation": "2024-07-06 16:12:39.622927",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -81,7 +82,7 @@
    "dt": "Supplier",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_section_break_ak8uj",
+   "fieldname": "custom_tin_details",
    "fieldtype": "Section Break",
    "hidden": 0,
    "hide_border": 0,
@@ -99,11 +100,12 @@
    "is_virtual": 0,
    "label": "TIN Details",
    "length": 0,
+   "link_filters": null,
    "mandatory_depends_on": null,
-   "modified": "2024-03-04 15:50:56.854009",
+   "modified": "2024-07-06 16:12:39.622927",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Supplier-custom_section_break_ak8uj",
+   "name": "Supplier-custom_tin_details",
    "no_copy": 0,
    "non_negative": 0,
    "options": null,
@@ -161,6 +163,7 @@
    "is_virtual": 0,
    "label": "Tin Verified",
    "length": 0,
+   "link_filters": null,
    "mandatory_depends_on": null,
    "modified": "2024-03-04 07:59:32.603721",
    "modified_by": "Administrator",
@@ -223,6 +226,7 @@
    "is_virtual": 0,
    "label": "Is IRS 1099 reporting required for supplier?",
    "length": 0,
+   "link_filters": null,
    "mandatory_depends_on": null,
    "modified": "2024-01-31 02:08:23.457621",
    "modified_by": "Administrator",
@@ -249,264 +253,7 @@
    "width": null
   }
  ],
- "custom_perms": [
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-01-10 16:34:11",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 0,
-   "export": 0,
-   "idx": 4,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:10.439760",
-   "modified_by": "Administrator",
-   "name": "1e9da6c3a1",
-   "owner": "Administrator",
-   "parent": "Supplier",
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Stock User",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-01-10 16:34:11",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 1,
-   "export": 0,
-   "idx": 7,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:10.444832",
-   "modified_by": "Administrator",
-   "name": "584294f135",
-   "owner": "Administrator",
-   "parent": "Supplier",
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-01-10 16:34:11",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 1,
-   "export": 0,
-   "idx": 2,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:10.449766",
-   "modified_by": "Administrator",
-   "name": "a29cd36693",
-   "owner": "Administrator",
-   "parent": "Supplier",
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase Manager",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 1
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "creation": "2013-01-10 16:34:11",
-   "delete": 1,
-   "docstatus": 0,
-   "email": 1,
-   "export": 1,
-   "idx": 3,
-   "if_owner": 0,
-   "import": 1,
-   "modified": "2023-12-14 14:19:10.454588",
-   "modified_by": "Administrator",
-   "name": "845872da1e",
-   "owner": "Administrator",
-   "parent": "Supplier",
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase Master Manager",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
-   "write": 1
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-01-10 16:34:11",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 1,
-   "export": 0,
-   "idx": 1,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:10.459453",
-   "modified_by": "Administrator",
-   "name": "b365b4d3b6",
-   "owner": "Administrator",
-   "parent": "Supplier",
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase User",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-01-10 16:34:11",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 0,
-   "export": 0,
-   "idx": 6,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:10.464289",
-   "modified_by": "Administrator",
-   "name": "eaecb6c515",
-   "owner": "Administrator",
-   "parent": "Supplier",
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Accounts User",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2013-01-10 16:34:11",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 1,
-   "export": 0,
-   "idx": 5,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:10.469190",
-   "modified_by": "Administrator",
-   "name": "609c07b6f3",
-   "owner": "Administrator",
-   "parent": "Supplier",
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Stock Manager",
-   "select": 0,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "_assign": null,
-   "_comments": null,
-   "_liked_by": null,
-   "_user_tags": null,
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "creation": "2023-12-14 14:19:10.475400",
-   "delete": 0,
-   "docstatus": 0,
-   "email": 0,
-   "export": 1,
-   "idx": 0,
-   "if_owner": 0,
-   "import": 0,
-   "modified": "2023-12-14 14:19:10.503225",
-   "modified_by": "Administrator",
-   "name": "48e0a5a1cf",
-   "owner": "Administrator",
-   "parent": "Supplier",
-   "permlevel": 0,
-   "print": 0,
-   "read": 0,
-   "report": 0,
-   "role": "Employee Self Service",
-   "select": 1,
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  }
- ],
+ "custom_perms": [],
  "doctype": "Supplier",
  "links": [
   {
@@ -519,9 +266,9 @@
    "is_child_table": 0,
    "link_doctype": "Party Specific Item",
    "link_fieldname": "party",
-   "modified": "2024-03-27 10:45:28.306585",
+   "modified": "2024-06-01 17:18:18.082819",
    "modified_by": "Administrator",
-   "name": "45778a0cfa",
+   "name": "0la4mo29ae",
    "owner": "Administrator",
    "parent": "Supplier",
    "parent_doctype": null,
@@ -536,7 +283,30 @@
    "_comments": null,
    "_liked_by": null,
    "_user_tags": null,
-   "creation": "2024-03-04 15:51:12.988279",
+   "creation": "2024-07-06 16:31:25.223998",
+   "default_value": null,
+   "doc_type": "Supplier",
+   "docstatus": 0,
+   "doctype_or_field": "DocField",
+   "field_name": "tax_tab",
+   "idx": 0,
+   "is_system_generated": 0,
+   "modified": "2024-07-06 16:31:25.223998",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Supplier-tax_tab-default",
+   "owner": "Administrator",
+   "property": "default",
+   "property_type": "Text",
+   "row_name": null,
+   "value": "Registered"
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "creation": "2024-07-06 16:13:53.988357",
    "default_value": null,
    "doc_type": "Supplier",
    "docstatus": 0,
@@ -544,7 +314,7 @@
    "field_name": null,
    "idx": 0,
    "is_system_generated": 0,
-   "modified": "2024-03-04 15:51:12.988279",
+   "modified": "2024-07-06 16:13:53.988357",
    "modified_by": "Administrator",
    "module": null,
    "name": "Supplier-main-field_order",
@@ -552,7 +322,30 @@
    "property": "field_order",
    "property_type": "Data",
    "row_name": null,
-   "value": "[\"naming_series\", \"supplier_name\", \"country\", \"column_break0\", \"supplier_group\", \"supplier_type\", \"is_transporter\", \"image\", \"defaults_section\", \"default_currency\", \"default_bank_account\", \"column_break_10\", \"default_price_list\", \"internal_supplier_section\", \"is_internal_supplier\", \"represents_company\", \"column_break_16\", \"companies\", \"column_break2\", \"supplier_details\", \"column_break_30\", \"website\", \"language\", \"dashboard_tab\", \"tax_tab\", \"tax_id\", \"custom_tin_verified\", \"irs_1099\", \"column_break_27\", \"tax_category\", \"tax_withholding_category\", \"custom_section_break_ak8uj\", \"custom_gst_category\", \"contact_and_address_tab\", \"address_contacts\", \"address_html\", \"column_break1\", \"contact_html\", \"primary_address_and_contact_detail_section\", \"column_break_44\", \"supplier_primary_address\", \"primary_address\", \"column_break_mglr\", \"supplier_primary_contact\", \"mobile_no\", \"email_id\", \"accounting_tab\", \"payment_terms\", \"default_accounts_section\", \"accounts\", \"settings_tab\", \"allow_purchase_invoice_creation_without_purchase_order\", \"allow_purchase_invoice_creation_without_purchase_receipt\", \"column_break_54\", \"is_frozen\", \"disabled\", \"warn_rfqs\", \"warn_pos\", \"prevent_rfqs\", \"prevent_pos\", \"block_supplier_section\", \"on_hold\", \"hold_type\", \"column_break_59\", \"release_date\", \"portal_users_tab\", \"portal_users\", \"column_break_1mqv\"]"
+   "value": "[\"naming_series\", \"supplier_name\", \"country\", \"column_break0\", \"supplier_group\", \"supplier_type\", \"is_transporter\", \"image\", \"defaults_section\", \"default_currency\", \"default_bank_account\", \"column_break_10\", \"default_price_list\", \"internal_supplier_section\", \"is_internal_supplier\", \"represents_company\", \"column_break_16\", \"companies\", \"column_break2\", \"supplier_details\", \"column_break_30\", \"website\", \"language\", \"dashboard_tab\", \"tax_tab\", \"tax_id\", \"custom_tin_verified\", \"irs_1099\", \"column_break_27\", \"tax_category\", \"tax_withholding_category\", \"custom_tin_details\", \"custom_gst_category\", \"contact_and_address_tab\", \"address_contacts\", \"address_html\", \"column_break1\", \"contact_html\", \"primary_address_and_contact_detail_section\", \"column_break_44\", \"supplier_primary_address\", \"primary_address\", \"column_break_mglr\", \"supplier_primary_contact\", \"mobile_no\", \"email_id\", \"accounting_tab\", \"payment_terms\", \"default_accounts_section\", \"accounts\", \"settings_tab\", \"allow_purchase_invoice_creation_without_purchase_order\", \"allow_purchase_invoice_creation_without_purchase_receipt\", \"column_break_54\", \"is_frozen\", \"disabled\", \"warn_rfqs\", \"warn_pos\", \"prevent_rfqs\", \"prevent_pos\", \"block_supplier_section\", \"on_hold\", \"hold_type\", \"column_break_59\", \"release_date\", \"portal_users_tab\", \"portal_users\", \"column_break_1mqv\"]"
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "creation": "2024-02-10 15:13:24.545634",
+   "default_value": null,
+   "doc_type": "Supplier",
+   "docstatus": 0,
+   "doctype_or_field": "DocField",
+   "field_name": "naming_series",
+   "idx": 0,
+   "is_system_generated": 0,
+   "modified": "2024-07-06 09:44:40.561185",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Supplier-naming_series-reqd",
+   "owner": "Administrator",
+   "property": "reqd",
+   "property_type": "Check",
+   "row_name": null,
+   "value": "0"
   },
   {
    "_assign": null,
@@ -567,7 +360,7 @@
    "field_name": "naming_series",
    "idx": 0,
    "is_system_generated": 0,
-   "modified": "2024-02-10 15:13:25.113690",
+   "modified": "2024-07-06 09:44:40.542209",
    "modified_by": "Administrator",
    "module": null,
    "name": "Supplier-naming_series-hidden",
@@ -582,7 +375,7 @@
    "_comments": null,
    "_liked_by": null,
    "_user_tags": null,
-   "creation": "2024-02-10 15:13:24.545634",
+   "creation": "2024-03-20 19:35:56.812814",
    "default_value": null,
    "doc_type": "Supplier",
    "docstatus": 0,
@@ -590,15 +383,15 @@
    "field_name": "naming_series",
    "idx": 0,
    "is_system_generated": 0,
-   "modified": "2024-02-10 15:13:24.545634",
+   "modified": "2024-03-20 19:35:56.812814",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Supplier-naming_series-reqd",
+   "name": "Supplier-naming_series-options",
    "owner": "Administrator",
-   "property": "reqd",
-   "property_type": "Check",
+   "property": "options",
+   "property_type": "Text",
    "row_name": null,
-   "value": "0"
+   "value": "SUP-.YYYY.-"
   }
  ],
  "sync_on_migrate": 1
diff --git a/burundi_compliance/burundi_compliance/doctype/gst_category/__init__.py b/burundi_compliance/burundi_compliance/doctype/gst_category/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/burundi_compliance/burundi_compliance/doctype/gst_category/gst_category.js b/burundi_compliance/burundi_compliance/doctype/gst_category/gst_category.js
new file mode 100644
index 0000000..1180c52
--- /dev/null
+++ b/burundi_compliance/burundi_compliance/doctype/gst_category/gst_category.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2024, Navari Limited and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("GST Category", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/burundi_compliance/burundi_compliance/doctype/gst_category/gst_category.json b/burundi_compliance/burundi_compliance/doctype/gst_category/gst_category.json
new file mode 100644
index 0000000..20caa8b
--- /dev/null
+++ b/burundi_compliance/burundi_compliance/doctype/gst_category/gst_category.json
@@ -0,0 +1,44 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:gst_category",
+ "creation": "2024-07-06 15:52:06.111678",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "gst_category"
+ ],
+ "fields": [
+  {
+   "fieldname": "gst_category",
+   "fieldtype": "Data",
+   "label": "GST Category",
+   "unique": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2024-07-06 15:54:36.236785",
+ "modified_by": "Administrator",
+ "module": "Burundi Compliance",
+ "name": "GST Category",
+ "naming_rule": "By fieldname",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/burundi_compliance/burundi_compliance/doctype/gst_category/gst_category.py b/burundi_compliance/burundi_compliance/doctype/gst_category/gst_category.py
new file mode 100644
index 0000000..065b763
--- /dev/null
+++ b/burundi_compliance/burundi_compliance/doctype/gst_category/gst_category.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, Navari Limited and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class GSTCategory(Document):
+	pass
diff --git a/burundi_compliance/burundi_compliance/doctype/gst_category/test_gst_category.py b/burundi_compliance/burundi_compliance/doctype/gst_category/test_gst_category.py
new file mode 100644
index 0000000..0a340c1
--- /dev/null
+++ b/burundi_compliance/burundi_compliance/doctype/gst_category/test_gst_category.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, Navari Limited and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestGSTCategory(FrappeTestCase):
+	pass
diff --git a/burundi_compliance/burundi_compliance/overrides/check_tin.py b/burundi_compliance/burundi_compliance/overrides/check_tin.py
index b21dadb..d347735 100644
--- a/burundi_compliance/burundi_compliance/overrides/check_tin.py
+++ b/burundi_compliance/burundi_compliance/overrides/check_tin.py
@@ -2,9 +2,14 @@
 import frappe
 from ..api_classes.base import OBRAPIBase            
           
+obr_integration_base = OBRAPIBase()
+
+auth_details=obr_integration_base.get_auth_details()
+allow_obr_to_track_sales=auth_details["allow_obr_to_track_sales"]
+				
+    
 def check_and_verify_tin(doc):
     if doc.tax_id is not None and doc.custom_tin_verified == 0:
-        obr_integration_base = OBRAPIBase()
         token = obr_integration_base.authenticate()
 
         tin_verifier = TinVerifier(token)
@@ -23,18 +28,18 @@ def check_and_verify_tin(doc):
 def customer_or_supplier_before_save(doc, method=None):
     
     '''Check and verify the customer's TIN if applicable.'''
-    
-    if doc.custom_gst_category == "Registered" and doc.tax_id is None:
-        frappe.throw("Le NIF est obligatoire pour les contribuables enregistrés.")
-        
-    elif doc.custom_gst_category == "Registered" and doc.tax_id is not None and doc.custom_tin_verified == 0:
-        check_and_verify_tin(doc)
+    if allow_obr_to_track_sales==1:
+        if doc.custom_gst_category == "Registered" and doc.tax_id is None:
+            frappe.throw("Le NIF est obligatoire pour les contribuables enregistrés.")
+            
+        elif doc.custom_gst_category == "Registered" and doc.tax_id is not None and doc.custom_tin_verified == 0:
+            check_and_verify_tin(doc)
 
 
 @frappe.whitelist(allow_guest=True)
 def supplier_before_save(doc, method=None):
-    
-    '''Check and verify the supplier's TIN if applicable.'''
-    if doc.tax_id is not None and doc.custom_tin_verified == 0:
-        check_and_verify_tin(doc)
+    if allow_obr_to_track_sales==1:
+        '''Check and verify the supplier's TIN if applicable.'''
+        if doc.tax_id is not None and doc.custom_tin_verified == 0:
+            check_and_verify_tin(doc)
         
diff --git a/burundi_compliance/fixtures/gst_category.json b/burundi_compliance/fixtures/gst_category.json
new file mode 100644
index 0000000..61dc565
--- /dev/null
+++ b/burundi_compliance/fixtures/gst_category.json
@@ -0,0 +1,44 @@
+[
+ {
+  "docstatus": 0,
+  "doctype": "GST Category",
+  "gst_category": "Unregistered",
+  "modified": "2024-07-06 15:54:54.581273",
+  "name": "Unregistered"
+ },
+ {
+  "docstatus": 0,
+  "doctype": "GST Category",
+  "gst_category": "Registered",
+  "modified": "2024-07-06 15:55:21.776417",
+  "name": "Registered"
+ },
+ {
+  "docstatus": 0,
+  "doctype": "GST Category",
+  "gst_category": "Oversees",
+  "modified": "2024-07-06 15:55:47.515360",
+  "name": "Oversees"
+ },
+ {
+  "docstatus": 0,
+  "doctype": "GST Category",
+  "gst_category": "Deemed Export",
+  "modified": "2024-07-06 15:56:34.986571",
+  "name": "Deemed Export"
+ },
+ {
+  "docstatus": 0,
+  "doctype": "GST Category",
+  "gst_category": "UIN Holders",
+  "modified": "2024-07-06 15:56:53.817946",
+  "name": "UIN Holders"
+ },
+ {
+  "docstatus": 0,
+  "doctype": "GST Category",
+  "gst_category": "Tax Deductors",
+  "modified": "2024-07-06 15:57:41.592325",
+  "name": "Tax Deductors"
+ }
+]
\ No newline at end of file
diff --git a/burundi_compliance/hooks.py b/burundi_compliance/hooks.py
index 4fc1d95..4fef37b 100644
--- a/burundi_compliance/hooks.py
+++ b/burundi_compliance/hooks.py
@@ -9,6 +9,7 @@
 
 fixtures=[
    "eBMS API Methods",
+   "GST Category",
 ]
 
 # Includes in <head>
@@ -46,7 +47,7 @@
     "Purchase Receipt":"burundi_compliance/client_scripts/add_stock_movement.js",
     "Delivery Note":"burundi_compliance/client_scripts/add_stock_movement.js",
     "Stock Entry":"burundi_compliance/client_scripts/add_stock_movement.js",
-    "doctype" : "public/js/doctype.js"}
+    }
 
 
 doctype_list_js = {