diff --git a/addons/l10n_at/account_tax.xml b/addons/l10n_at/account_tax.xml
index 521245bda5b..f80488fe1ea 100644
--- a/addons/l10n_at/account_tax.xml
+++ b/addons/l10n_at/account_tax.xml
@@ -1,77 +1,142 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
+    <data>
 
 
     <!-- Account Tags -->
 
-        <record id="tax_10%_Einfuhrumsatzsteuer" model="account.account.tag">
-            <field name="name">10% Einfuhrumsatzsteuer</field>
+        <record id="tag_at_01" model="account.account.tag">
+            <field name="name">UST Vorauszahlung / Überschuss - bitte dem Betrag ein Minuszeichen voranstellen</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_20%_Einfuhrumsatzsteuer" model="account.account.tag">
-            <field name="name">20% Einfuhrumsatzsteuer</field>
+        <record id="tag_at_02" model="account.account.tag">
+            <field name="name">Steuern</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_20%_USt_EU" model="account.account.tag">
-            <field name="name">20% USt EU</field>
+        <record id="tag_at_03" model="account.account.tag">
+            <field name="name">Vorsteuer aus innergemeinschaftlichem Erwerb</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_20%_MwSt" model="account.account.tag">
-            <field name="name">20% MwSt</field>
+        <record id="tag_at_04" model="account.account.tag">
+            <field name="name">Innergemeinschaftliche Erwerbe</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_10%_USt_EU" model="account.account.tag">
-            <field name="name">10% USt EU</field>
+        <record id="tag_at_05" model="account.account.tag">
+            <field name="name">Steuerpflichtige Umsätze (Lieferungen, sonstige Leistungen und Eigenverbrauch)</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_10%_MwSt" model="account.account.tag">
-            <field name="name">10% MwSt</field>
+        <record id="tag_at_06" model="account.account.tag">
+            <field name="name">zum Steuersatz von 20 %</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_innergem_Erwerb_20%" model="account.account.tag">
-            <field name="name">innergem. Erwerb 20%</field>
+        <record id="tag_at_07" model="account.account.tag">
+            <field name="name">BMGzum Steuersatz von 20 %</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_20%_VSt" model="account.account.tag">
-            <field name="name">20% VSt</field>
+        <record id="tag_at_08" model="account.account.tag">
+            <field name="name">zum Steuersatz von 10 %</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_innergem_Erwerb_10%" model="account.account.tag">
-            <field name="name">innergem. Erwerb 10%</field>
+        <record id="tag_at_09" model="account.account.tag">
+            <field name="name">BMGzum Steuersatz von 10 %</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_10%_VSt" model="account.account.tag">
-            <field name="name">10% VSt</field>
+        <record id="tag_at_10" model="account.account.tag">
+            <field name="name">Lieferungen, sonstige Leistungen und Eigenverbrauch</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_steuerfreie_Ausfuhr" model="account.account.tag">
-            <field name="name">steuerfreie Ausfuhr</field>
+        <record id="tag_at_11" model="account.account.tag">
+            <field name="name">Steuerpflichtige Umsätze (Lieferungen, sonstige Leistungen und Eigenverbrauch)</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_strf_i_g_L" model="account.account.tag">
-            <field name="name">strf. i.g.L</field>
+        <record id="tag_at_12" model="account.account.tag">
+            <field name="name">zum Steuersatz von 20 %</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_10%_EUSt" model="account.account.tag">
-            <field name="name">10% EUSt</field>
+        <record id="tag_at_13" model="account.account.tag">
+            <field name="name">zum Steuersatz von 10%</field>
             <field name="applicability">taxes</field>
         </record>
 
-        <record id="tax_20%_EUSt" model="account.account.tag">
-            <field name="name">20% EUSt</field>
+        <record id="tag_at_14" model="account.account.tag">
+            <field name="name">Bemessungsgrundlage</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_15" model="account.account.tag">
+            <field name="name">Steuern</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_16" model="account.account.tag">
+            <field name="name">Lieferungen und sonstige Leistungen (einschließlich unentgeltlicher Wertabgaben)</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_17" model="account.account.tag">
+            <field name="name">Steuerfreie Umsätze mit Vorsteuerabzug</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_18" model="account.account.tag">
+            <field name="name">§ 6 Abs. 1 Z 1 iVm § 7 (Ausfuhrlieferungen)</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_19" model="account.account.tag">
+            <field name="name">Art. 6 Abs. 1 (Innergemeinschaftliche Lieferungen)</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_20" model="account.account.tag">
+            <field name="name">Innergemeinschaftliche Erwerbe</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_21" model="account.account.tag">
+            <field name="name">Vorsteuer (dient lediglich der Verprobung)</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_22" model="account.account.tag">
+            <field name="name">Einfuhren</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_23" model="account.account.tag">
+            <field name="name">Einfuhren zum Steuersatz von 10 %</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_24" model="account.account.tag">
+            <field name="name">Einfuhren zum Steuersatz von 20 %</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_25" model="account.account.tag">
+            <field name="name">Rechnungen von anderen Unternehmern und innergemeinschaftliche Dreiecksgeschäfte</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_26" model="account.account.tag">
+            <field name="name">zum Steuersatz von 10 %</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tag_at_27" model="account.account.tag">
+            <field name="name">zum Steuersatz von 20 %</field>
             <field name="applicability">taxes</field>
         </record>
 
@@ -87,7 +152,7 @@
             <field name="refund_account_id" ref="chart3500"/>
             <field name="account_id" ref="chart3500"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_20%_MwSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_27'), ref('tag_at_12')])]"/>
         </record>
     
         <record id="tax_at_mwst_10" model="account.tax.template">
@@ -99,7 +164,7 @@
             <field name="refund_account_id" ref="chart3500"/>
             <field name="account_id" ref="chart3500"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_10%_MwSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_26'), ref('tag_at_13')])]"/>
         </record>
         
         <record id="tax_at_vst_20" model="account.tax.template">
@@ -111,7 +176,7 @@
             <field name="refund_account_id" ref="chart2500"/>
             <field name="account_id" ref="chart2500"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_20%_VSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_27'), ref('tag_at_07') ,ref('tag_at_06'), ref('tag_at_03')])]"/>
         </record>
         
         <record id="tax_at_vst_10" model="account.tax.template">
@@ -123,7 +188,7 @@
             <field name="refund_account_id" ref="chart2500"/>
             <field name="account_id" ref="chart2500"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_10%_VSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_09'), ref('tag_at_03'), ref('tag_at_08')])]"/>
         </record>
         
         <record model="account.tax.template" id="tax_import_20">
@@ -135,7 +200,7 @@
             <field name="account_id" ref="chart2510"/>
             <field name="refund_account_id" ref="chart2510"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_20%_EUSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_24')])]"/>
         </record>
         
         <record model="account.tax.template" id="tax_import_10">
@@ -147,7 +212,7 @@
             <field name="account_id" ref="chart2510"/>
             <field name="refund_account_id" ref="chart2510"/>
             <field name="type_tax_use">purchase</field>
-             <field name="tag_ids" eval="[(6,0,[ref('tax_10%_EUSt')])]"/>
+             <field name="tag_ids" eval="[(6,0,[ref('tag_at_23')])]"/>
         </record>
         
         <record model="account.tax.template" id="tax_eu_20_purchase_ust">
@@ -170,7 +235,7 @@
             <field name="account_id" ref="chart2501"/>
             <field name="refund_account_id" ref="chart2501"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_20%_VSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_27'), ref('tag_at_07'), ref('tag_at_06'), ref('tag_at_03')])]"/>
         </record>
 
         <record model="account.tax.template" id="tax_eu_20_purchase">
@@ -182,7 +247,7 @@
             <field name="type_tax_use">purchase</field>
             <field name="amount_type">group</field>
             <field name="children_tax_ids" eval="[(6, 0, [ref('tax_eu_20_purchase_ust'), ref('tax_eu_20_purchase_vst')])]"/>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_innergem_Erwerb_20%')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_07')])]"/>
         </record>
 
         <record model="account.tax.template" id="tax_eu_10_purchase_ust">
@@ -205,7 +270,7 @@
             <field name="account_id" ref="chart2503"/>
             <field name="refund_account_id" ref="chart2503"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_10%_VSt')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_09'), ref('tag_at_03'), ref('tag_at_08')])]"/>
         </record>
 
         <record model="account.tax.template" id="tax_eu_10_purchase">
@@ -216,7 +281,7 @@
             <field name="amount_type">group</field>
             <field name="type_tax_use">purchase</field>
             <field name="children_tax_ids" eval="[(6, 0, [ref('tax_eu_10_purchase_ust'), ref('tax_eu_10_purchase_vst')])]"/>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_innergem_Erwerb_10%')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_09')])]"/>
         </record>
         
         <record model="account.tax.template" id="tax_at_mwst_20_eu">
@@ -228,7 +293,7 @@
             <field name="account_id" ref="chart3510"/>
             <field name="refund_account_id" ref="chart3510"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_20%_USt_EU')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_27'), ref('tag_at_12')])]"/>
         </record>
 
         <record model="account.tax.template" id="tax_at_mwst_10_eu">
@@ -240,7 +305,7 @@
             <field name="account_id" ref="chart3511"/>
             <field name="refund_account_id" ref="chart3511"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_10%_USt_EU')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_26'), ref('tag_at_13')])]"/>
         </record>
         
         <record model="account.tax.template" id="tax_eu_sale_at">
@@ -252,7 +317,7 @@
             <field name="account_id" ref="chart3500"/>
             <field name="refund_account_id" ref="chart3500"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_strf_i_g_L')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_19')])]"/>
         </record>
 
         <record model="account.tax.template" id="tax_export_at">
@@ -264,7 +329,7 @@
             <field name="account_id" ref="chart3500"/>
             <field name="refund_account_id" ref="chart3500"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_steuerfreie_Ausfuhr')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_at_18')])]"/>
         </record>