diff --git a/ext/custom-addons/dp_custom/__manifest__.py b/ext/custom-addons/dp_custom/__manifest__.py
index 539b99e3..4dda11a2 100644
--- a/ext/custom-addons/dp_custom/__manifest__.py
+++ b/ext/custom-addons/dp_custom/__manifest__.py
@@ -49,7 +49,8 @@
         'data/glaser_company_data.xml',
         'data/tz_austria_company_data.xml',
         'data/product_data.xml',
-        'data/tax_data.xml',
+        'data/tz_tax_data.xml',
+        'data/glaser_tax_data.xml',
         'data/cron_job.xml',
         'views/dp_custom_views.xml',
         'views/res_line_views.xml',
diff --git a/ext/custom-addons/dp_custom/data/glaser_tax_data.xml b/ext/custom-addons/dp_custom/data/glaser_tax_data.xml
new file mode 100644
index 00000000..033a73be
--- /dev/null
+++ b/ext/custom-addons/dp_custom/data/glaser_tax_data.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+    <record id="glaser_account_tax_20_mwst" model="account.tax">
+        <field name="name">20% MwSt.</field>
+        <field name="description">20% MwSt.</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">20</field>
+        <field name="bmd_tax_code">1</field>
+        <field name="company_id" eval="ref('glaser_and_co_company')"/>
+    </record>
+
+    <record id="glaser_account_tax_10_mwst" model="account.tax">
+        <field name="name">10% MwSt.</field>
+        <field name="description">10% MwSt.</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">10</field>
+        <field name="bmd_tax_code">1</field>
+        <field name="company_id" eval="ref('glaser_and_co_company')"/>
+    </record>
+
+    <record id="glaser_account_tax_0_mwst" model="account.tax">
+        <field name="name">0% MwSt.</field>
+        <field name="description">0% MwSt.</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">0</field>
+        <field name="bmd_tax_code">1</field>
+        <field name="company_id" eval="ref('glaser_and_co_company')"/>
+    </record>
+
+    <record id="glaser_account_tax_0_reverse_charge" model="account.tax">
+        <field name="name">0% Reverse Charge</field>
+        <field name="description">0% Rev. Chg.</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">0</field>
+        <field name="bmd_tax_code">7</field>
+        <field name="company_id" eval="ref('glaser_and_co_company')"/>
+    </record>
+
+    <record id="glaser_account_tax_0_drittland" model="account.tax">
+        <field name="name">0% Drittland</field>
+        <field name="description">0% Drittland</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount_type">percent</field>
+        <field name="amount">0</field>
+        <field name="bmd_tax_code">5</field>
+        <field name="company_id" eval="ref('glaser_and_co_company')"/>
+    </record>
+
+    <record id="glaser_account_fiscal_position_ig_ausland" model="account.fiscal.position">
+        <field name="name">IG-Ausland</field>
+        <field name="note">Übergang der Steuerschuld auf den Leistungsempfänger gem § 19 Abs 1
+            UStG
+        </field>
+        <field name="company_id" eval="ref('glaser_and_co_company')"/>
+    </record>
+
+    <record id="glaser_account_fiscal_position_tax_ig_ausland" model="account.fiscal.position.tax">
+        <field name="tax_src_id" search="[('name','=','20% MwSt.')]"/>
+        <field name="tax_dest_id" search="[('name','=','0% Reverse Charge')]"/>
+        <field name="position_id" ref="glaser_account_fiscal_position_ig_ausland"/>
+    </record>
+
+    <record id="glaser_account_fiscal_position_drittland" model="account.fiscal.position">
+        <field name="name">Drittland</field>
+        <field name="note"/>
+        <field name="company_id" eval="ref('glaser_and_co_company')"/>
+    </record>
+
+    <record id="glaser_account_fiscal_position_tax_drittland" model="account.fiscal.position.tax">
+        <field name="tax_src_id" search="[('name','=','20% MwSt.')]"/>
+        <field name="tax_dest_id" search="[('name','=','0% Drittland')]"/>
+        <field name="position_id" ref="glaser_account_fiscal_position_drittland"/>
+    </record>
+
+</odoo>
diff --git a/ext/custom-addons/dp_custom/data/tax_data.xml b/ext/custom-addons/dp_custom/data/tz_tax_data.xml
similarity index 62%
rename from ext/custom-addons/dp_custom/data/tax_data.xml
rename to ext/custom-addons/dp_custom/data/tz_tax_data.xml
index 894b9f8f..c68472fc 100644
--- a/ext/custom-addons/dp_custom/data/tax_data.xml
+++ b/ext/custom-addons/dp_custom/data/tz_tax_data.xml
@@ -1,73 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
 
-    <record id="account_tax_20_mwst" model="account.tax">
+    <record id="tz_account_tax_20_mwst" model="account.tax">
         <field name="name">20% MwSt.</field>
         <field name="description">20% MwSt.</field>
         <field name="type_tax_use">sale</field>
         <field name="amount_type">percent</field>
         <field name="amount">20</field>
         <field name="bmd_tax_code">1</field>
+        <field name="company_id" eval="ref('base.main_company')"/>
     </record>
 
-    <record id="account_tax_10_mwst" model="account.tax">
+    <record id="tz_account_tax_10_mwst" model="account.tax">
         <field name="name">10% MwSt.</field>
         <field name="description">10% MwSt.</field>
         <field name="type_tax_use">sale</field>
         <field name="amount_type">percent</field>
         <field name="amount">10</field>
         <field name="bmd_tax_code">1</field>
+        <field name="company_id" eval="ref('base.main_company')"/>
     </record>
 
-    <record id="account_tax_0_mwst" model="account.tax">
+    <record id="tz_account_tax_0_mwst" model="account.tax">
         <field name="name">0% MwSt.</field>
         <field name="description">0% MwSt.</field>
         <field name="type_tax_use">sale</field>
         <field name="amount_type">percent</field>
         <field name="amount">0</field>
         <field name="bmd_tax_code">1</field>
+        <field name="company_id" eval="ref('base.main_company')"/>
     </record>
 
-    <record id="account_tax_0_reverse_charge" model="account.tax">
+    <record id="tz_account_tax_0_reverse_charge" model="account.tax">
         <field name="name">0% Reverse Charge</field>
         <field name="description">0% Rev. Chg.</field>
         <field name="type_tax_use">sale</field>
         <field name="amount_type">percent</field>
         <field name="amount">0</field>
         <field name="bmd_tax_code">7</field>
+        <field name="company_id" eval="ref('base.main_company')"/>
     </record>
 
-    <record id="account_tax_0_drittland" model="account.tax">
+    <record id="tz_account_tax_0_drittland" model="account.tax">
         <field name="name">0% Drittland</field>
         <field name="description">0% Drittland</field>
         <field name="type_tax_use">sale</field>
         <field name="amount_type">percent</field>
         <field name="amount">0</field>
         <field name="bmd_tax_code">5</field>
+        <field name="company_id" eval="ref('base.main_company')"/>
     </record>
 
-    <record id="account_fiscal_position_ig_ausland" model="account.fiscal.position">
+    <record id="tz_account_fiscal_position_ig_ausland" model="account.fiscal.position">
         <field name="name">IG-Ausland</field>
         <field name="note">Übergang der Steuerschuld auf den Leistungsempfänger gem § 19 Abs 1
             UStG
         </field>
+        <field name="company_id" eval="ref('base.main_company')"/>
     </record>
 
-    <record id="account_fiscal_position_tax_ig_ausland" model="account.fiscal.position.tax">
+    <record id="tz_account_fiscal_position_tax_ig_ausland" model="account.fiscal.position.tax">
         <field name="tax_src_id" search="[('name','=','20% MwSt.')]"/>
         <field name="tax_dest_id" search="[('name','=','0% Reverse Charge')]"/>
-        <field name="position_id" ref="account_fiscal_position_ig_ausland"/>
+        <field name="position_id" ref="tz_account_fiscal_position_ig_ausland"/>
     </record>
 
-    <record id="account_fiscal_position_drittland" model="account.fiscal.position">
+    <record id="tz_account_fiscal_position_drittland" model="account.fiscal.position">
         <field name="name">Drittland</field>
         <field name="note"/>
+        <field name="company_id" eval="ref('base.main_company')"/>
     </record>
 
-    <record id="account_fiscal_position_tax_drittland" model="account.fiscal.position.tax">
+    <record id="tz_account_fiscal_position_tax_drittland" model="account.fiscal.position.tax">
         <field name="tax_src_id" search="[('name','=','20% MwSt.')]"/>
         <field name="tax_dest_id" search="[('name','=','0% Drittland')]"/>
-        <field name="position_id" ref="account_fiscal_position_drittland"/>
+        <field name="position_id" ref="tz_account_fiscal_position_drittland"/>
     </record>
 
 </odoo>