diff --git a/addons/l10n_in/__manifest__.py b/addons/l10n_in/__manifest__.py
index 93e6e2f9d21..06caad91412 100644
--- a/addons/l10n_in/__manifest__.py
+++ b/addons/l10n_in/__manifest__.py
@@ -39,7 +39,6 @@ Sheet, now only Vertical format has been permitted Which is Supported By Odoo.
         'views/product_template_view.xml',
         'views/port_code_views.xml',
         'views/report_invoice.xml',
-        'views/res_company_view.xml',
         'views/res_country_state_view.xml',
         'views/res_partner_views.xml',
         'views/account_tax_views.xml',
diff --git a/addons/l10n_in/views/account_journal_views.xml b/addons/l10n_in/views/account_journal_views.xml
index 34e4713613f..3f857c1c2aa 100644
--- a/addons/l10n_in/views/account_journal_views.xml
+++ b/addons/l10n_in/views/account_journal_views.xml
@@ -12,7 +12,7 @@
                 <attribute name="attrs">{'invisible': ['|', '&amp;', ('country_code', '!=', 'IN'), ('type', '!=', 'cash'), '&amp;', ('country_code', '=', 'IN'), ('type', 'not in', ['bank', 'cash', 'sale', 'purchase'])]}</attribute>
             </field>
             <field name="company_id" position="after">
-                <field name="l10n_in_gstin_partner_id" context="{'show_vat':True}" options='{"no_create": True,"always_reload": True}'/>
+                <field name="l10n_in_gstin_partner_id" context="{'show_vat':True}" options='{"no_create": True,"always_reload": True}' attrs="{'invisible': [('country_code', '!=', 'IN')]}"/>
             </field>
         </field>
     </record>
diff --git a/addons/l10n_in/views/res_company_view.xml b/addons/l10n_in/views/res_company_view.xml
deleted file mode 100644
index abbf8d4c83a..00000000000
--- a/addons/l10n_in/views/res_company_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="l10n_in_view_company_form" model="ir.ui.view">
-        <field name="name">l10n.in.view.company.form</field>
-        <field name="model">res.company</field>
-        <field name="priority" eval="100"/>
-        <field name="inherit_id" ref="base.view_company_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='vat']" position="attributes">
-                <attribute name="string" attrs="{'invisible': [('country_code', '!=', 'IN')]}">GSTIN</attribute>
-            </xpath>
-        </field>
-    </record>
-
-</odoo>
diff --git a/addons/l10n_in/views/res_country_state_view.xml b/addons/l10n_in/views/res_country_state_view.xml
index bdac8ff6241..282d5045413 100644
--- a/addons/l10n_in/views/res_country_state_view.xml
+++ b/addons/l10n_in/views/res_country_state_view.xml
@@ -7,7 +7,7 @@
         <field name="inherit_id" ref="base.view_country_state_form"/>
         <field name="arch" type="xml">
             <field name="code" position="after">
-                <field name="l10n_in_tin"/>
+                <field name="l10n_in_tin" attrs="{'invisible': [('country_id', '!=', %(base.in)d)]}"/>
             </field>
         </field>
     </record>