[IMP] l10n_no: change report format to rf-0002

Integration with new financial reports rf-002 in Norwegian localization

task- 1969011

closes odoo/odoo#37357

Signed-off-by: Josse Colpaert <jco@openerp.com>

2 files changed, 984 insertions, 166 deletions

diff --git a/addons/l10n_no/data/account_tax_data.xml b/addons/l10n_no/data/account_tax_data.xml
index 341f5207689..d61747fb22d 100644
--- a/addons/l10n_no/data/account_tax_data.xml
+++ b/addons/l10n_no/data/account_tax_data.xml
@@ -1,11 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
+       <record id="tax1" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">0 Ingen mvabehandling 0%</field>
+            <field name="description">Ingen mvabehandling(anskaffelser)</field>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        </record>
 
-        <record id="tax1" model="account.tax.template">
+        <record id="tax2" model="account.tax.template">
             <field name="chart_template_id" ref="no_chart_template"/>
-            <field name="name">Utgående 25% mva</field>
-            <field name="description">Utgående 25% mva</field>
+            <field name="name">1 Inngående mva høy sats 25%</field>
+            <field name="description">Fradrag for inngående mva</field>
+            <field name="amount">25</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_25"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2711'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_14')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2711'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_14')],
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax3" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">3 Utgående mva høy sats 25%</field>
+            <field name="description">Utgående mva</field>
             <field name="amount">25</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
@@ -14,34 +77,388 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_utgaende_avgift_hoy_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_3')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('chart2701'),
-                    'plus_report_line_ids': [ref('account_tax_report_line_beregnet_utgaende_avgift_hoy_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_3_tax')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_utgaende_avgift_hoy_sats')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_3')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('chart2701'),
-                    'minus_report_line_ids': [ref('account_tax_report_line_beregnet_utgaende_avgift_hoy_sats')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_3_tax')],
                 }),
             ]"/>
         </record>
 
-        <record id="tax2" model="account.tax.template">
+        <record id="tax4" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">5 Mvafritt salg 0%</field>
+            <field name="description">Mvafritt salg</field>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_6')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_6')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax5" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">6 Omsetning utenfor mvaloven 0%</field>
+            <field name="description">Omsetning utenfor merverdiavgiftsloven</field>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_1')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_1')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax6" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">7 Ingen mvabehandling(inntekter) 0%</field>
+            <field name="description">Ingen mvabehandling(inntekter)</field>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax7" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">11 Inngående mva middel sats 15%</field>
+            <field name="description">Fradrag for inngående mva</field>
+            <field name="amount">15</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_15"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2713'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_15')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2713'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_15')],
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax8" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">12 Inngående mva råfisk 11%</field>
+            <field name="description">Fradrag for inngående mva</field>
+            <field name="amount">11</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_15"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2713'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_15')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2713'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_15')],
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax9" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">13 Inngående mva lav sats 12%</field>
+            <field name="description">Fradrag for inngående mva</field>
+            <field name="amount">12</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_12"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2714'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_16')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2714'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_16')],
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax10" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">14 Innførselsmva høy sats 25%</field>
+            <field name="description">Fradrag for innførselsmva</field>
+            <field name="amount">25</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_25"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2711'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_17')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2711'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_17')],
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax11" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">15 Innførselsmva middel sats 15%</field>
+            <field name="description">Fradrag for innførselsmva</field>
+            <field name="amount">15</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_15"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2713'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_18')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2713'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_18')],
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax12" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">20 Grunnlag ved innførsel av varer nullsats 0%</field>
+            <field name="description">Grunnlag ved innførsel av varer</field>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax13" model="account.tax.template">
             <field name="chart_template_id" ref="no_chart_template"/>
-            <field name="name">Utgående 15% mva</field>
-            <field name="description">Utgående 15% mva</field>
+            <field name="name">21 Grunnlag ved innførsel av varer høy sats 25%</field>
+            <field name="description">Grunnlag ved innførsel av varer</field>
+            <field name="amount">25</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_25"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax14" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">22 Grunnlag ved innførsel av varer middel sats 15%</field>
+            <field name="description">Grunnlag ved innførsel av varer</field>
+            <field name="amount">15</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_15"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax15" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">31 Utgående mva middel sats 15%</field>
+            <field name="description">Utgående mva</field>
             <field name="amount">15</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
@@ -50,70 +467,70 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_utgaende_avgift_mellom_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_4')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('chart2703'),
-                    'plus_report_line_ids': [ref('account_tax_report_line_beregnet_utgaende_avgift_mellom_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_4_tax')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_utgaende_avgift_mellom_sats')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_4')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('chart2703'),
-                    'minus_report_line_ids': [ref('account_tax_report_line_beregnet_utgaende_avgift_mellom_sats')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_4_tax')],
                 }),
             ]"/>
         </record>
 
-        <record id="tax3" model="account.tax.template">
+        <record id="tax16" model="account.tax.template">
             <field name="chart_template_id" ref="no_chart_template"/>
-            <field name="name">Utgående 10% mva</field>
-            <field name="description">Utgående 10% mva</field>
-            <field name="amount">10</field>
+            <field name="name">32 Utgående mva råfisk 11%</field>
+            <field name="description">Utgående mva</field>
+            <field name="amount">11</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
-            <field name="tax_group_id" ref="tax_group_10"/>
+            <field name="tax_group_id" ref="tax_group_15"/>
             <field name="invoice_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_utgaende_avgift_lav_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_4')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart2704'),
-                    'plus_report_line_ids': [ref('account_tax_report_line_beregnet_utgaende_avgift_lav_sats')],
+                    'account_id': ref('chart2703'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_4_tax')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_utgaende_avgift_lav_sats')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_4')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart2704'),
-                    'minus_report_line_ids': [ref('account_tax_report_line_beregnet_utgaende_avgift_lav_sats')],
+                    'account_id': ref('chart2703'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_4_tax')],
                 }),
             ]"/>
         </record>
 
-        <record id="tax3b" model="account.tax.template">
+        <record id="tax17" model="account.tax.template">
             <field name="chart_template_id" ref="no_chart_template"/>
-            <field name="name">Utgående 12% mva</field>
-            <field name="description">Utgående 12% mva</field>
+            <field name="name">33 Utgående mva lav sats 12%</field>
+            <field name="description">Utgående mva</field>
             <field name="amount">12</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
@@ -122,34 +539,98 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_utgaende_avgift_lav_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_5')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('chart2704'),
-                    'plus_report_line_ids': [ref('account_tax_report_line_beregnet_utgaende_avgift_lav_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_5_tax')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_utgaende_avgift_lav_sats')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_5')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('chart2704'),
-                    'minus_report_line_ids': [ref('account_tax_report_line_beregnet_utgaende_avgift_lav_sats')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_5_tax')],
                 }),
             ]"/>
         </record>
 
-        <record id="tax4" model="account.tax.template">
+        <record id="tax18" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">51 Innenlands omsetning med omvendt avgiftsplikt nullsats 0%</field>
+            <field name="description">Innlands omsetning med omvendt avgiftsplikt</field>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_7')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_7')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax19" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">52 Utførsel av varer og tjenester nullsats 0%</field>
+            <field name="description">Utførsel av varer og tjenester</field>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">sale</field>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_8')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_8')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax20" model="account.tax.template">
             <field name="chart_template_id" ref="no_chart_template"/>
-            <field name="name">Inngående 25% mva</field>
-            <field name="description">Inngående 25% mva</field>
+            <field name="name">81 Innførsel av varer med fradrag for innførselsmva høy sats 25%</field>
+            <field name="description">Innførsel av varer med fradrag for innførselsmva</field>
             <field name="amount">25</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -158,34 +639,70 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_inngaende_avgift_hoy_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_9')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('chart2711'),
-                    'plus_report_line_ids': [ref('account_tax_report_line_beregnet_inngaende_avgift_hoy_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_9_tax'), ref('account_tax_report_line_post_17')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_inngaende_avgift_hoy_sats')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_9')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart2711'),
-                    'minus_report_line_ids': [ref('account_tax_report_line_beregnet_inngaende_avgift_hoy_sats')],
+                    'account_id': ref('chart2701'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_9_tax'), ref('account_tax_report_line_post_17')],
                 }),
             ]"/>
         </record>
 
-        <record id="tax5" model="account.tax.template">
+        <record id="tax21" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">82 Innførsel av varer uten fradrag for innførselsmva høy sats 25%</field>
+            <field name="description">Innførsel av varer uten fradrag for innførselsmva</field>
+            <field name="amount">25</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_25"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_9')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2701'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_9_tax')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_9')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2701'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_9_tax')],
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax22" model="account.tax.template">
             <field name="chart_template_id" ref="no_chart_template"/>
-            <field name="name">Inngående 15% mva</field>
-            <field name="description">Inngående 15% mva</field>
+            <field name="name">83 Innførsel av varer med fradrag for innførselsmva middel sats 15%</field>
+            <field name="description">Innførsel av varer med fradrag for innførselsmva</field>
             <field name="amount">15</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -194,70 +711,174 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_inngaende_avgift_mellom_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_10')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
                     'account_id': ref('chart2713'),
-                    'plus_report_line_ids': [ref('account_tax_report_line_beregnet_inngaende_avgift_mellom_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_10_tax')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_inngaende_avgift_mellom_sats')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_10')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart2713'),
-                    'minus_report_line_ids': [ref('account_tax_report_line_beregnet_inngaende_avgift_mellom_sats')],
+                    'account_id': ref('chart2703'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_10_tax')],
                 }),
             ]"/>
         </record>
 
-        <record id="tax6" model="account.tax.template">
+        <record id="tax23" model="account.tax.template">
             <field name="chart_template_id" ref="no_chart_template"/>
-            <field name="name">Inngående 10% mva</field>
-            <field name="description">Inngående 10% mva</field>
-            <field name="amount">10</field>
+            <field name="name">84 Innførsel av varer uten fradrag for innførselsmva middel sats 15%</field>
+            <field name="description">Innførsel av varer uten fradrag for innførselsmva</field>
+            <field name="amount">15</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tax_group_id" ref="tax_group_10"/>
+            <field name="tax_group_id" ref="tax_group_15"/>
             <field name="invoice_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_inngaende_avgift_lav_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_10')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart2714'),
-                    'plus_report_line_ids': [ref('account_tax_report_line_beregnet_inngaende_avgift_lav_sats')],
+                    'account_id': ref('chart2703'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_10_tax')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_inngaende_avgift_lav_sats')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_10')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart2714'),
-                    'minus_report_line_ids': [ref('account_tax_report_line_beregnet_inngaende_avgift_lav_sats')],
+                    'account_id': ref('chart2703'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_10_tax')],
                 }),
             ]"/>
         </record>
 
-        <record id="tax6b" model="account.tax.template">
+        <record id="tax24" model="account.tax.template">
             <field name="chart_template_id" ref="no_chart_template"/>
-            <field name="name">Inngående 12% mva</field>
-            <field name="description">Inngående 12% mva</field>
+            <field name="name">85 Innførsel av varer uten mva beregning 0%</field>
+            <field name="description">Innførsel av varer som det ikke skal beregnes mervediavgift av</field>
+            <field name="amount">0</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_11')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_11')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax25" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">86 Tjenester kjøpt fra utlandet med fradrag for mva høy sats 25%</field>
+            <field name="description">Tjenester kjøpt fra utlandet med fradrag for mva</field>
+            <field name="amount">25</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_25"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_12')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2712'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_12_tax'), ref('account_tax_report_line_post_17')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_12')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2702'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_12_tax'), ref('account_tax_report_line_post_17')],
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax26" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">87 Tjenester kjøpt fra utlandet uten fradrag for mva høy sats 25%</field>
+            <field name="description">Tjenester kjøpt fra utlandet uten fradrag for mva</field>
+            <field name="amount">25</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_25"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_12')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2702'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_12_tax')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_12')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2702'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_12_tax')],
+                }),
+            ]"/>
+        </record>
+
+        <record id="tax27" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">88 Tjenester kjøpt fra utlandet med fradrag for mva lav sats 12%</field>
+            <field name="description">Tjenester kjøpt fra utlandet med fradrag for mva</field>
             <field name="amount">12</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -266,91 +887,136 @@
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_inngaende_avgift_lav_sats')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_12')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart2714'),
-                    'plus_report_line_ids': [ref('account_tax_report_line_beregnet_inngaende_avgift_lav_sats')],
+                    'account_id': ref('chart2712'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_12_tax'), ref('account_tax_report_line_post_17')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_line_grunnlag_for_inngaende_avgift_lav_sats')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_12')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-                    'account_id': ref('chart2714'),
-                    'minus_report_line_ids': [ref('account_tax_report_line_beregnet_inngaende_avgift_lav_sats')],
+                    'account_id': ref('chart2702'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_12_tax'), ref('account_tax_report_line_post_17')],
                 }),
             ]"/>
         </record>
 
-        <record id="tax7" model="account.tax.template">
+        <record id="tax28" model="account.tax.template">
             <field name="chart_template_id" ref="no_chart_template"/>
-            <field name="name">Inngående 0% mva</field>
-            <field name="description">Inngående 0% mva</field>
-            <field name="amount">0</field>
+            <field name="name">89 Tjenester kjøpt fra utlandet uten fradrag for mva lav sats 12%</field>
+            <field name="description">Tjenester kjøpt fra utlandet uten fradrag for mva</field>
+            <field name="amount">12</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="tax_group_id" ref="tax_group_12"/>
             <field name="invoice_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_12')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
+                    'account_id': ref('chart2702'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_12_tax')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
-              (0,0, {
+                (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-              }),
-              (0,0, {
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_12')],
+                }),
+                (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
-              }),
+                    'account_id': ref('chart2702'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_12_tax')],
+                }),
             ]"/>
         </record>
 
-        <record id="tax8" model="account.tax.template">
+        <record id="tax29" model="account.tax.template">
             <field name="chart_template_id" ref="no_chart_template"/>
-            <field name="name">Utgående 0% mva</field>
-            <field name="description">Utgående 0% mva</field>
-            <field name="amount">0</field>
+            <field name="name">91 Kjøp av klimakvoter eller gull med fradrag for mva høy sats 25%</field>
+            <field name="description">Kjøp av klimakvoter eller gull med fradrag for mva</field>
+            <field name="amount">25</field>
             <field name="amount_type">percent</field>
-            <field name="type_tax_use">sale</field>
-            <field name="tax_group_id" ref="tax_group_0"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_25"/>
             <field name="invoice_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'plus_report_line_ids': [ref('account_tax_report_line_ikke_momspliktig_omsetning')],
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_13')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
+                    'account_id': ref('chart2712'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_13_tax'), ref('account_tax_report_line_post_14')],
                 }),
             ]"/>
             <field name="refund_repartition_line_ids" eval="[(5,0,0),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'base',
-                    'minus_report_line_ids': [ref('account_tax_report_line_ikke_momspliktig_omsetning')],
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_13')],
                 }),
                 (0,0, {
                     'factor_percent': 100,
                     'repartition_type': 'tax',
+                    'account_id': ref('chart2702'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_13_tax'), ref('account_tax_report_line_post_14')],
                 }),
             ]"/>
         </record>
 
+        <record id="tax30" model="account.tax.template">
+            <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="name">92 Kjøp av klimakvoter eller gull uten fradrag for mva høy sats 25%</field>
+            <field name="description">Kjøp av klimakvoter eller gull uten fradrag for mva</field>
+            <field name="amount">25</field>
+            <field name="amount_type">percent</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="tax_group_id" ref="tax_group_25"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_13')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2702'),
+                    'plus_report_line_ids': [ref('account_tax_report_line_post_13_tax')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_13')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('chart2702'),
+                    'minus_report_line_ids': [ref('account_tax_report_line_post_13_tax')],
+                }),
+            ]"/>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/addons/l10n_no/data/account_tax_report_data.xml b/addons/l10n_no/data/account_tax_report_data.xml
index 40395cb67c9..290061087c2 100644
--- a/addons/l10n_no/data/account_tax_report_data.xml
+++ b/addons/l10n_no/data/account_tax_report_data.xml
@@ -7,133 +7,285 @@
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_ikke_momspliktig_omsetning" model="account.tax.report.line">
-        <field name="name">Ikke momspliktig omsetning</field>
-        <field name="tag_name">Ikke momspliktig omsetning</field>
-        <field name="code">NOTAX_0100</field>
+    <record id="account_tax_report_line_samlet_omsetning" model="account.tax.report.line">
+        <field name="name">A. Samlet omsetning, uttak og innførsel</field>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_1" model="account.tax.report.line">
+        <field name="name">Post 1 Samlet omsetning og uttak utenfor merverdiavgiftsloven</field>
+        <field name="tag_name">Post 1</field>
+        <field name="code">NOTAX_01</field>
         <field name="sequence" eval="0"/>
-        <field name="parent_id" ref="account_tax_report_line_sum_avgiftsgrunnlag"/>
+        <field name="parent_id" ref="account_tax_report_line_samlet_omsetning"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_grunnlag_for_utgaende_avgift_hoy_sats" model="account.tax.report.line">
-        <field name="name">Grunnlag for utgående avgift, høy sats</field>
-        <field name="tag_name">Grunnlag for utgående avgift, høy sats</field>
-        <field name="code">NOTAX_0101</field>
+    <record id="account_tax_report_line_post_2" model="account.tax.report.line">
+        <field name="name">Post 2 Samlet omsetning og uttak innenfor merverdiavgiftloven og innførsel</field>
+        <field name="formula">NOTAX_03+NOTAX_04+NOTAX_05+NOTAX_06+NOTAX_07+NOTAX_08</field>
+        <field name="code">NOTAX_02</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_samlet_omsetning"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_innenlands_omsetning" model="account.tax.report.line">
+        <field name="name">B. Innenlands omsetning og uttak</field>
         <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_line_sum_avgiftsgrunnlag"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_grunnlag_for_utgaende_avgift_mellom_sats" model="account.tax.report.line">
-        <field name="name">Grunnlag for utgående avgift, mellom sats</field>
-        <field name="tag_name">Grunnlag for utgående avgift, mellom sats</field>
-        <field name="code">NOTAX_0102</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_line_sum_avgiftsgrunnlag"/>
+    <record id="account_tax_report_line_post_3" model="account.tax.report.line">
+        <field name="name">Post 3 Innenlands omsetning og uttak, og beregnet avgift 25 %</field>
+        <field name="tag_name">Post 3 Base</field>
+        <field name="code">NOTAX_03</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_3_tax" model="account.tax.report.line">
+        <field name="name">Post 3 Innenlands omsetning og uttak, og beregnet avgift 25 % Tax</field>
+        <field name="tag_name">Post 3 Tax</field>
+        <field name="code">NOTAX_03_1</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_4" model="account.tax.report.line">
+        <field name="name">Post 4 Innenlands omsetning og uttak, og beregnet avgift 15 %</field>
+        <field name="tag_name">Post 4 Base</field>
+        <field name="code">NOTAX_04</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_4_tax" model="account.tax.report.line">
+        <field name="name">Post 4 Innenlands omsetning og uttak, og beregnet avgift 15 % Tax</field>
+        <field name="tag_name">Post 4 Tax</field>
+        <field name="code">NOTAX_04_1</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_5" model="account.tax.report.line">
+        <field name="name">Post 5 Innenlands omsetning og uttak, og beregnet avgift 12 %</field>
+        <field name="tag_name">Post 5 Base</field>
+        <field name="code">NOTAX_05</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_grunnlag_for_utgaende_avgift_lav_sats" model="account.tax.report.line">
-        <field name="name">Grunnlag for utgående avgift, lav sats</field>
-        <field name="tag_name">Grunnlag for utgående avgift, lav sats</field>
-        <field name="code">NOTAX_0103</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_line_sum_avgiftsgrunnlag"/>
+    <record id="account_tax_report_line_post_5_tax" model="account.tax.report.line">
+        <field name="name">Post 5 Innenlands omsetning og uttak, og beregnet avgift 12 % Tax</field>
+        <field name="tag_name">Post 5 Tax</field>
+        <field name="code">NOTAX_05_1</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_sum_innkjop" model="account.tax.report.line">
-        <field name="name">Sum innkjøp</field>
-        <field name="sequence" eval="2"/>
+    <record id="account_tax_report_line_post_6" model="account.tax.report.line">
+        <field name="name">Post 6 Innenlands omsetning og uttak fritatt for merverdiavgift</field>
+        <field name="tag_name">Post 6</field>
+        <field name="code">NOTAX_06</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_grunnlag_for_inngaende_avgift_hoy_sats" model="account.tax.report.line">
-        <field name="name">Grunnlag for inngående avgift, høy sats</field>
-        <field name="tag_name">Grunnlag for inngående avgift, høy sats</field>
-        <field name="code">NOTAX_0104</field>
+    <record id="account_tax_report_line_post_7" model="account.tax.report.line">
+        <field name="name">Post 7 Innenlands omsetning med omvendt avgiftsplikt</field>
+        <field name="tag_name">Post 7</field>
+        <field name="code">NOTAX_07</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innenlands_omsetning"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_utforsel" model="account.tax.report.line">
+        <field name="name">C. Utførsel</field>
         <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_line_sum_innkjop"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_grunnlag_for_inngaende_avgift_mellom_sats" model="account.tax.report.line">
-        <field name="name">Grunnlag for inngående avgift, mellom sats</field>
-        <field name="tag_name">Grunnlag for inngående avgift, mellom sats</field>
-        <field name="code">NOTAX_0105</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_line_sum_innkjop"/>
+    <record id="account_tax_report_line_post_8" model="account.tax.report.line">
+        <field name="name">Post 8 Utførsel av varer og tjenester fritatt for merverdiavgift</field>
+        <field name="tag_name">Post 8</field>
+        <field name="code">NOTAX_08</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_utforsel"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_innforsel_av_varer" model="account.tax.report.line">
+        <field name="name">D. Innførsel av varer</field>
+        <field name="sequence" eval="1"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_grunnlag_for_inngaende_avgift_lav_sats" model="account.tax.report.line">
-        <field name="name">Grunnlag for inngående avgift, lav sats</field>
-        <field name="tag_name">Grunnlag for inngående avgift, lav sats</field>
-        <field name="code">NOTAX_0106</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_line_sum_innkjop"/>
+    <record id="account_tax_report_line_post_9" model="account.tax.report.line">
+        <field name="name">Post 9 Innførsel av varer, og beregnet avgift 25 %</field>
+        <field name="tag_name">Post 9 Base</field>
+        <field name="code">NOTAX_09</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innforsel_av_varer"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_netto_beregnet_avgift" model="account.tax.report.line">
-        <field name="name">Netto beregnet avgift</field>
-        <field name="sequence" eval="3"/>
-        <field name="formula">- NOTAX_0201 - NOTAX_0202 - NOTAX_0203 + NOTAX_0204 + NOTAX_0205 + NOTAX_0206</field>
+    <record id="account_tax_report_line_post_9_tax" model="account.tax.report.line">
+        <field name="name">Post 9 Innførsel av varer, og beregnet avgift 25 % Tax</field>
+        <field name="tag_name">Post 9 Tax</field>
+        <field name="code">NOTAX_09_1</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innforsel_av_varer"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_beregnet_inngaende_avgift_hoy_sats" model="account.tax.report.line">
-        <field name="name">Beregnet inngående avgift, høy sats</field>
-        <field name="tag_name">Beregnet inngående avgift, høy sats</field>
-        <field name="code">NOTAX_0201</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_line_netto_beregnet_avgift"/>
+    <record id="account_tax_report_line_post_10" model="account.tax.report.line">
+        <field name="name">Post 10 Innførsel av varer, og beregnet avgift 15 %</field>
+        <field name="tag_name">Post 10 Base</field>
+        <field name="code">NOTAX_10</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innforsel_av_varer"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_beregnet_inngaende_avgift_lav_sats" model="account.tax.report.line">
-        <field name="name">Beregnet inngående avgift, lav sats</field>
-        <field name="tag_name">Beregnet inngående avgift, lav sats</field>
-        <field name="code">NOTAX_0202</field>
-        <field name="sequence" eval="5"/>
-        <field name="parent_id" ref="account_tax_report_line_netto_beregnet_avgift"/>
+    <record id="account_tax_report_line_post_10_tax" model="account.tax.report.line">
+        <field name="name">Post 10 Innførsel av varer, og beregnet avgift 15 % Tax</field>
+        <field name="tag_name">Post 10 Tax</field>
+        <field name="code">NOTAX_10_1</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innforsel_av_varer"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_beregnet_inngaende_avgift_mellom_sats" model="account.tax.report.line">
-        <field name="name">Beregnet inngående avgift, mellom sats</field>
-        <field name="tag_name">Beregnet inngående avgift, mellom sats</field>
-        <field name="code">NOTAX_0203</field>
-        <field name="sequence" eval="6"/>
-        <field name="parent_id" ref="account_tax_report_line_netto_beregnet_avgift"/>
+    <record id="account_tax_report_line_post_11" model="account.tax.report.line">
+        <field name="name">Post 11 Innførsel av varer som det ikke skal beregnes merverdiavgift av</field>
+        <field name="tag_name">Post 11</field>
+        <field name="code">NOTAX_11</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_innforsel_av_varer"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_beregnet_utgaende_avgift_hoy_sats" model="account.tax.report.line">
-        <field name="name">Beregnet utgående avgift, høy sats</field>
-        <field name="tag_name">Beregnet utgående avgift, høy sats</field>
-        <field name="code">NOTAX_0204</field>
+    <record id="account_tax_report_line_kjop_med_omvendt_avgiftsplikt" model="account.tax.report.line">
+        <field name="name">E. Kjøp med omvendt avgiftsplikt</field>
         <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_line_netto_beregnet_avgift"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_beregnet_utgaende_avgift_lav_sats" model="account.tax.report.line">
-        <field name="name">Beregnet utgående avgift, lav sats</field>
-        <field name="tag_name">Beregnet utgående avgift, lav sats</field>
-        <field name="code">NOTAX_0205</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_line_netto_beregnet_avgift"/>
+    <record id="account_tax_report_line_post_12" model="account.tax.report.line">
+        <field name="name">Post 12 Tjenester kjøpt fra utlandet, og beregnet avgift 25 %</field>
+        <field name="tag_name">Post 12 Base</field>
+        <field name="code">NOTAX_12</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_kjop_med_omvendt_avgiftsplikt"/>
         <field name="country_id" ref="base.no"/>
     </record>
 
-    <record id="account_tax_report_line_beregnet_utgaende_avgift_mellom_sats" model="account.tax.report.line">
-        <field name="name">Beregnet utgående avgift, mellom sats</field>
-        <field name="tag_name">Beregnet utgående avgift, mellom sats</field>
-        <field name="code">NOTAX_0206</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_line_netto_beregnet_avgift"/>
+    <record id="account_tax_report_line_post_12_tax" model="account.tax.report.line">
+        <field name="name">Post 12 Tjenester kjøpt fra utlandet, og beregnet avgift 25 % Tax</field>
+        <field name="tag_name">Post 12 Tax</field>
+        <field name="code">NOTAX_12_1</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_kjop_med_omvendt_avgiftsplikt"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_13" model="account.tax.report.line">
+        <field name="name">Post 13 Innenlands kjøp av varer og tjenester, og beregnet avgift 25 %</field>
+        <field name="tag_name">Post 13 Base</field>
+        <field name="code">NOTAX_13</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_kjop_med_omvendt_avgiftsplikt"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_13_tax" model="account.tax.report.line">
+        <field name="name">Post 13 Innenlands kjøp av varer og tjenester, og beregnet avgift 25 % Tax</field>
+        <field name="tag_name">Post 13 Tax</field>
+        <field name="code">NOTAX_13_1</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_kjop_med_omvendt_avgiftsplikt"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_fradragsberettigen_innenlands" model="account.tax.report.line">
+        <field name="name">F. Fradragsberettiget innenlands inngående avgift</field>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_14" model="account.tax.report.line">
+        <field name="name">Post 14 Fradragsberettiget innenlands inngående avgift 25 %</field>
+        <field name="tag_name">Post 14</field>
+        <field name="code">NOTAX_14</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_fradragsberettigen_innenlands"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_15" model="account.tax.report.line">
+        <field name="name">Post 15 Fradragsberettiget innenlands inngående avgift 15 %</field>
+        <field name="tag_name">Post 15</field>
+        <field name="code">NOTAX_15</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_fradragsberettigen_innenlands"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_16" model="account.tax.report.line">
+        <field name="name">Post 16 Fradragsberettiget innenlands inngående avgift 12 %</field>
+        <field name="tag_name">Post 16</field>
+        <field name="code">NOTAX_16</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_fradragsberettigen_innenlands"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_fradragsberettiget_innforselsmerverdiavgift" model="account.tax.report.line">
+        <field name="name">G. Fradragsberettiget innførselsmerverdiavgift</field>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_17" model="account.tax.report.line">
+        <field name="name">Post 17 Fradragsberettiget innførselsmerverdiavgift 25 %</field>
+        <field name="tag_name">Post 17</field>
+        <field name="code">NOTAX_17</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_fradragsberettiget_innforselsmerverdiavgift"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_18" model="account.tax.report.line">
+        <field name="name">Post 18 Fradragsberettiget innførselsmerverdiavgift 15 %</field>
+        <field name="tag_name">Post 18</field>
+        <field name="code">NOTAX_18</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_fradragsberettiget_innforselsmerverdiavgift"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_sum" model="account.tax.report.line">
+        <field name="name">H. Sum</field>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.no"/>
+    </record>
+
+    <record id="account_tax_report_line_post_19" model="account.tax.report.line">
+        <field name="name">Post 19 Avgift å betale</field>
+        <field name="formula">NOTAX_03_1+NOTAX_04_1+NOTAX_05_1+NOTAX_09_1+NOTAX_10_1+NOTAX_12_1+NOTAX_13_1-NOTAX_14-NOTAX_15-NOTAX_16-NOTAX_17-NOTAX_18</field>
+        <field name="code">NOTAX_19</field>
+        <field name="sequence" eval="0"/>
+        <field name="parent_id" ref="account_tax_report_line_sum"/>
         <field name="country_id" ref="base.no"/>
     </record>