diff --git a/addons/l10n_at/data/account_account_template.xml b/addons/l10n_at/data/account_account_template.xml
index 70ee1d52e06..caaf1e897f4 100644
--- a/addons/l10n_at/data/account_account_template.xml
+++ b/addons/l10n_at/data/account_account_template.xml
@@ -21,7 +21,6 @@
             <field name="chart_template_id" ref="l10n_at_chart_template"/>
         </record>
 
-
         <record id="chart_at_template_0010" model="account.account.template">
           <field name="name">Aufwendungen für das Ingangsetzen und Erweitern eines Betriebes</field>
           <field name="code">0010</field>
@@ -1034,7 +1033,6 @@
           <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
           <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PCVIII1')])]" />
         </record>
-
         <record id="chart_at_template_3530" model="account.account.template">
           <field name="name">Verrechnungskonto Finanzamt</field>
           <field name="code">3530</field>
@@ -1042,9 +1040,7 @@
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_payable" />
           <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PCVIII1')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
         </record>
-
         <record id="chart_at_template_3540" model="account.account.template">
           <field name="name">Verrechnung Lohnsteuer</field>
           <field name="code">3540</field>
@@ -1052,7 +1048,6 @@
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
           <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PCVIII1')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
         </record>
         <record id="chart_at_template_3541" model="account.account.template">
           <field name="name">Verrechnung Dienstgeberbeitrag</field>
@@ -1061,14 +1056,12 @@
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
           <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PCVIII1')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
         </record>
         <record id="chart_at_template_3542" model="account.account.template">
           <field name="name">Verrechnung Dienstgeberzuschlag</field>
           <field name="code">3542</field>
           <field name="reconcile" eval="True"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
-          <field eval="[(6,0,[])]" name="tax_ids"/>
           <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
           <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PCVIII1')])]" />
         </record>
@@ -1077,7 +1070,6 @@
           <field name="code">3550</field>
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
-          <field eval="[(6,0,[])]" name="tax_ids"/>
           <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
           <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PCVIII1')])]" />
         </record>
@@ -1086,7 +1078,6 @@
           <field name="code">3551</field>
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
-          <field eval="[(6,0,[])]" name="tax_ids"/>
           <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
           <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PCVIII1')])]" />
         </record>
@@ -1097,14 +1088,12 @@
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_payable" />
           <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PCVIII2')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
         </record>
         <record id="chart_at_template_3610" model="account.account.template">
           <field name="name">Verrechnungskonto Magistrat/Gemeinde (KoSt, U-Bahn, etc.)</field>
           <field name="code">3610</field>
           <field name="reconcile" eval="True"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
-          <field eval="[(6,0,[])]" name="tax_ids"/>
           <field name="user_type_id" ref="account.data_account_type_payable" />
           <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PCVIII2')])]" />
         </record>
@@ -1113,7 +1102,6 @@
           <field name="code">3740</field>
           <field name="reconcile" eval="True"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
-          <field eval="[(6,0,[])]" name="tax_ids"/>
           <field name="user_type_id" ref="account.data_account_type_payable" />
           <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PD')])]" />
         </record>
@@ -1124,7 +1112,6 @@
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_revenue" />
           <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT1')])]" />
-
         </record>
         <record id="chart_at_template_4001" model="account.account.template">
           <field name="name">Brutto-Umsatzerlöse im Inland (10%)</field>
@@ -1225,8 +1212,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
         </record>
         <record id="chart_at_template_6205" model="account.account.template">
           <field name="name">Geschäftsführerbezug</field>
@@ -1234,8 +1220,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
         </record>
         <record id="chart_at_template_6242" model="account.account.template">
           <field name="name">Urlaubsabfindung (Angestellte)</field>
@@ -1243,8 +1228,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
         </record>
         <record id="chart_at_template_6260" model="account.account.template">
           <field name="name">Sonstige Bezüge (Angestellte)</field>
@@ -1252,8 +1236,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
         </record>
         <record id="chart_at_template_6270" model="account.account.template">
           <field name="name">Sachbezug (Angestellte)</field>
@@ -1261,8 +1244,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
         </record>
         <record id="chart_at_template_6271" model="account.account.template">
           <field name="name">Sachbezug (Geschäftsführer)</field>
@@ -1270,8 +1252,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
         </record>
         <record id="chart_at_template_6310" model="account.account.template">
           <field name="name">Grundgehälter (Überstunden)</field>
@@ -1279,8 +1260,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
         </record>
         <record id="chart_at_template_6330" model="account.account.template">
           <field name="name">Gehälter (Überstundenzuschläge)</field>
@@ -1288,8 +1268,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
         </record>
         <record id="chart_at_template_6340" model="account.account.template">
           <field name="name">Veränderung noch nicht konsumierter Urlaub</field>
@@ -1297,8 +1276,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6I')])]" />
         </record>
         <record id="chart_at_template_6400" model="account.account.template">
           <field name="name">Beiträge für betriebliche Mitarbeitervorsorgekasse</field>
@@ -1306,8 +1284,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
         </record>
 
         <record id="chart_at_template_6560" model="account.account.template">
@@ -1316,8 +1293,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
         </record>
 
         <record id="chart_at_template_6660" model="account.account.template">
@@ -1326,8 +1302,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
         </record>
         <record id="chart_at_template_6661" model="account.account.template">
           <field name="name">Dienstgeberbeitrag zum Familienlastenausgleichsfonds (DB)</field>
@@ -1335,8 +1310,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
         </record>
         <record id="chart_at_template_6662" model="account.account.template">
           <field name="name">Zuschlag zum Dienstnehmerbeitrag (DZ)</field>
@@ -1344,8 +1318,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
         </record>
         <record id="chart_at_template_6640" model="account.account.template">
           <field name="name">Dienstgeberabgabe der Gemeinde Wien (U-Bahn Steuer)</field>
@@ -1353,8 +1326,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
         </record>
 
         <record id="chart_at_template_6700" model="account.account.template">
@@ -1363,8 +1335,7 @@
           <field name="user_type_id" ref="account.data_account_type_expenses" />
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
-          <field eval="[(6,0,[])]" name="tax_ids"/>
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT6II')])]" />
         </record>
 
         <record id="chart_at_template_6900" model="account.account.template">
@@ -1398,7 +1369,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
         </record>
         <record id="chart_at_template_763" model="account.account.template">
           <field name="name">Fachliteratur und Zeitungen</field>
@@ -1406,7 +1377,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
         </record>
         <record id="chart_at_template_7690" model="account.account.template">
           <field name="name">Spenden und Trinkgelder</field>
@@ -1415,7 +1386,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
         </record>
         <record id="chart_at_template_7770" model="account.account.template">
           <field name="name">Aus- und Fortbildung</field>
@@ -1423,7 +1394,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
         </record>
         <record id="chart_at_template_7780" model="account.account.template">
           <field name="name">Mitgliedsbeiträge</field>
@@ -1431,7 +1402,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
         </record>
         <record id="chart_at_template_7790" model="account.account.template">
           <field name="name">Spesen des Geldverkehrs</field>
@@ -1439,7 +1410,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
         </record>
         <record id="chart_at_template_7820" model="account.account.template">
           <field name="name">Buchwert abgegangener Anlagen, ausgenommen Finanzanlagen</field>
@@ -1448,7 +1419,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
         </record>
         <record id="chart_at_template_7830" model="account.account.template">
           <field name="name">Verluste aus dem Abgang vom Anlagevermögen, ausgenommen Finanzanlagen</field>
@@ -1456,7 +1427,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
         </record>
         <record id="chart_at_template_7860" model="account.account.template">
           <field name="name">Kursverluste aus Fremdwährungstransaktionen</field>
@@ -1464,7 +1435,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
         </record>
         <record id="chart_at_template_7890" model="account.account.template">
           <field name="name">Skontoerträge auf sonstige betriebliche Aufwendungen</field>
@@ -1472,7 +1443,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
         </record>
         <record id="chart_at_template_7900" model="account.account.template">
           <field name="name">Aufwandsstellenrechnung</field>
@@ -1508,7 +1479,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_expenses" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_FIN10')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_operating'), ref('l10n_at.account_tag_l10n_at_EBIT8')])]" />
         </record>
         <record id="chart_at_template_8140" model="account.account.template">
           <field name="name">Erlöse aus dem Abgang von Beteiligungen</field>
@@ -1516,7 +1487,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_other_income" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_FIN10')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_financing'), ref('l10n_at.account_tag_l10n_at_FIN10')])]" />
         </record>
         <record id="chart_at_template_8150" model="account.account.template">
           <field name="name">Erlöse aus dem Abgang von sonstigen Finanzanlagen</field>
@@ -1524,7 +1495,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_other_income" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_FIN10')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_financing'), ref('l10n_at.account_tag_l10n_at_FIN10')])]" />
         </record>
         <record id="chart_at_template_8160" model="account.account.template">
           <field name="name">Erlöse aus dem Abgang von Wertpapieren des Umlaufvermögens</field>
@@ -1532,7 +1503,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_other_income" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_FIN10')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_financing'), ref('l10n_at.account_tag_l10n_at_FIN10')])]" />
         </record>
         <record id="chart_at_template_8170" model="account.account.template">
           <field name="name">Buchwert abgegangener Beteiligungen</field>
@@ -1540,7 +1511,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_other_income" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_FIN10')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_financing'), ref('l10n_at.account_tag_l10n_at_FIN10')])]" />
         </record>
         <record id="chart_at_template_8180" model="account.account.template">
           <field name="name">Buchwert abgegangener sonstiger Finanzanlagen</field>
@@ -1548,7 +1519,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_other_income" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_FIN11')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_financing'), ref('l10n_at.account_tag_l10n_at_FIN11')])]" />
         </record>
         <record id="chart_at_template_8190" model="account.account.template">
           <field name="name">Buchwert abgegangener Wertpapiere des Umlaufvermögens</field>
@@ -1556,7 +1527,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_other_income" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_FIN11')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_financing'), ref('l10n_at.account_tag_l10n_at_FIN11')])]" />
         </record>
         <record id="chart_at_template_8200" model="account.account.template">
           <field name="name">Erträge aus dem Abgang von und der Zuschreibung zu Finanzanlagen</field>
@@ -1564,7 +1535,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_other_income" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_FIN10')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_financing'), ref('l10n_at.account_tag_l10n_at_FIN10')])]" />
         </record>
         <record id="chart_at_template_8210" model="account.account.template">
           <field name="name">Erträge aus dem Abgang von und der Zuschreibung zu Wertpapieren des Umlaufvermögens</field>
@@ -1572,7 +1543,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_other_income" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_FIN11')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_financing'), ref('l10n_at.account_tag_l10n_at_FIN11')])]" />
         </record>
         <record id="chart_at_template_8350" model="account.account.template">
           <field name="name">Nicht ausgenützte Lieferantenskonti</field>
@@ -1580,7 +1551,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_other_income" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_FIN12')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_financing'), ref('l10n_at.account_tag_l10n_at_FIN12')])]" />
         </record>
         <record id="chart_at_template_8990" model="account.account.template">
           <field name="name">Gewinnabfuhr bzw. Verlustüberrechnung aus Ergebnisabführungsverträgen</field>
@@ -1588,7 +1559,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_other_income" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_FIN12')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_financing'), ref('l10n_at.account_tag_l10n_at_FIN12')])]" />
         </record>
         <record id="chart_at_template_9190" model="account.account.template">
           <field name="name">Nicht eingeforderte ausstehende Einlagen</field>
@@ -1596,7 +1567,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_equity" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PAI')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_financing'), ref('l10n_at.account_tag_l10n_at_PAI')])]" />
         </record>
         <record id="chart_at_template_9390" model="account.account.template">
           <field name="name">Bilanzgewinn (-verlust)</field>
@@ -1604,7 +1575,7 @@
           <field name="reconcile" eval="False"/>
           <field name="chart_template_id" ref="l10n_at_chart_template"/>
           <field name="user_type_id" ref="account.data_account_type_equity" />
-          <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PAIV')])]" />
+          <field name="tag_ids" eval="[(6, 0, [ref('account.account_tag_financing'), ref('l10n_at.account_tag_l10n_at_PAIV')])]" />
         </record>
         <record id="chart_at_template_9800" model="account.account.template">
           <field name="name">Eröffnungsbilanz</field>