From f0dd02fcbdacc154874e043073b52b828a5950f2 Mon Sep 17 00:00:00 2001
From: "Torvald B. Bringsvor" <torvald@bringsvor.com>
Date: Thu, 10 Sep 2015 09:33:24 +0200
Subject: [PATCH] Updated l10n_no with correct VAT rates and 4 digits accounts.

---
 addons/l10n_no/__openerp__.py    |  9 ++--
 addons/l10n_no/account_chart.xml | 15 ++++++-
 addons/l10n_no/account_tax.xml   | 74 ++++++++++++++++++++++++--------
 3 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/addons/l10n_no/__openerp__.py b/addons/l10n_no/__openerp__.py
index b86a8ffd398..5837f77fba6 100644
--- a/addons/l10n_no/__openerp__.py
+++ b/addons/l10n_no/__openerp__.py
@@ -2,11 +2,14 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    "name" : "Norway - Accounting",
-    "version" : "1.0",
+    "name" : "Norway - Chart of Accounts",
+    "version" : "1.1",
     "author" : "Rolv Råen",
     "category" : "Localization/Account Charts",
-    "description": "This is the module to manage the accounting chart for Norway in Open ERP.",
+    "description": """This is the module to manage the accounting chart for Norway in Odoo.
+
+Updated for Odoo 9 by Bringsvor Consulting AS <www.bringsvor.com>
+""",
     "depends" : ["account", "base_iban", "base_vat"],
     "demo_xml" : [],
     "data" : ["account_chart.xml",
diff --git a/addons/l10n_no/account_chart.xml b/addons/l10n_no/account_chart.xml
index b21c00d7932..f484cf29957 100644
--- a/addons/l10n_no/account_chart.xml
+++ b/addons/l10n_no/account_chart.xml
@@ -28,7 +28,7 @@
             <field name="name">Norway's Chart of Accounts</field>
             <field name="cash_account_code_prefix">1900</field>
             <field name="bank_account_code_prefix">1920</field>
-            <field name="code_digits">6</field>
+            <field name="code_digits">4</field>
             <field name="currency_id" ref="base.NOK"/>
             <field name="transfer_account_id" ref="chart1940"/>
         </record>
@@ -556,6 +556,7 @@
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="name">Andre markedsbaserte finansielle instrumenter</field>
             <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
         </record>
         <record id="chart1880" model="account.account.template">
             <field name="code">1880</field>
@@ -563,6 +564,7 @@
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="name">Andre finansielle instrumenter</field>
             <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
         </record>
         <record id="chart1910" model="account.account.template">
             <field name="code">1910</field>
@@ -1039,6 +1041,7 @@
             <field name="user_type_id" ref="account.data_account_type_revenue" />
             <field name="name">Salgsinntekt handelsvarer avgiftspl. høy sats</field>
             <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
         </record>
         <record id="chart3010" model="account.account.template">
             <field name="code">3010</field>
@@ -1046,6 +1049,7 @@
             <field name="user_type_id" ref="account.data_account_type_revenue" />
             <field name="name">Salgsinntekt egentilv. varer avgiftspl. høy sats</field>
             <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
         </record>
         <record id="chart3020" model="account.account.template">
             <field name="code">3020</field>
@@ -1136,12 +1140,14 @@
             <field name="reconcile" eval="False"/>
             <field name="user_type_id" ref="account.data_account_type_revenue" />
             <field name="name">Salgsinntekt handelsvarer avgiftsfri</field>
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
             <field name="chart_template_id" ref="no_chart_template"/>
         </record>
         <record id="chart3110" model="account.account.template">
             <field name="code">3110</field>
             <field name="reconcile" eval="False"/>
             <field name="user_type_id" ref="account.data_account_type_revenue" />
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
             <field name="name">Salgsinntekt egentilvirkede varer avgiftsfri</field>
             <field name="chart_template_id" ref="no_chart_template"/>
         </record>
@@ -1150,12 +1156,14 @@
             <field name="reconcile" eval="False"/>
             <field name="user_type_id" ref="account.data_account_type_revenue" />
             <field name="name">Salgsinntekt tjenester avgiftsfri</field>
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
             <field name="chart_template_id" ref="no_chart_template"/>
         </record>
         <record id="chart3160" model="account.account.template">
             <field name="code">3160</field>
             <field name="reconcile" eval="False"/>
             <field name="user_type_id" ref="account.data_account_type_revenue" />
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
             <field name="name">Uttak av varer avgiftsfritt</field>
             <field name="chart_template_id" ref="no_chart_template"/>
         </record>
@@ -2299,6 +2307,7 @@
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="name">Annen finansinntekt</field>
             <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
         </record>
         <record id="chart8080" model="account.account.template">
             <field name="code">8080</field>
@@ -2306,6 +2315,7 @@
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="name">Verdiøkning finanseille omløpsmidler</field>
             <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
         </record>
         <record id="chart8100" model="account.account.template">
             <field name="code">8100</field>
@@ -2313,12 +2323,14 @@
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="name">Verdired. av markedsbas.finans. omløps.</field>
             <field name="chart_template_id" ref="no_chart_template"/>
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
         </record>
         <record id="chart8110" model="account.account.template">
             <field name="code">8110</field>
             <field name="reconcile" eval="False"/>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="name">Nedskrivn. av andre finansielle omløps.</field>
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
             <field name="chart_template_id" ref="no_chart_template"/>
         </record>
         <record id="chart8120" model="account.account.template">
@@ -2326,6 +2338,7 @@
             <field name="reconcile" eval="False"/>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="name">Nedskrivning av finansielle anleggsmidl.</field>
+            <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
             <field name="chart_template_id" ref="no_chart_template"/>
         </record>
         <record id="chart8130" model="account.account.template">
diff --git a/addons/l10n_no/account_tax.xml b/addons/l10n_no/account_tax.xml
index bbfe72509fe..4b786317ac5 100644
--- a/addons/l10n_no/account_tax.xml
+++ b/addons/l10n_no/account_tax.xml
@@ -7,8 +7,8 @@
 		<field name="name">Utgående 25% mva</field>
 		<field name="applicability">taxes</field>
 	</record>
-	<record id="tax_tag_ut14" model="account.account.tag">
-		<field name="name">Utgående 14% mva</field>
+	<record id="tax_tag_ut15" model="account.account.tag">
+		<field name="name">Utgående 15% mva</field>
 		<field name="applicability">taxes</field>
 	</record>
 	<record id="tax_tag_ut8" model="account.account.tag">
@@ -19,8 +19,8 @@
 		<field name="name">Inngående 25% mva</field>
 		<field name="applicability">taxes</field>
 	</record>
-	<record id="tax_tag_in14" model="account.account.tag">
-		<field name="name">Inngående 14% mva</field>
+	<record id="tax_tag_in15" model="account.account.tag">
+		<field name="name">Inngående 15% mva</field>
 		<field name="applicability">taxes</field>
 	</record>
 	<record id="tax_tag_in8" model="account.account.tag">
@@ -28,27 +28,38 @@
 		<field name="applicability">taxes</field>
 	</record>
 
+        <record id="tax_tag_in0" model="account.account.tag">
+                <field name="name">Inngående 0% mva</field>
+                <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tag_ut0" model="account.account.tag">
+                <field name="name">Utgående 0% mva</field>
+                <field name="applicability">taxes</field>
+        </record>
+
+
 <record id="tax1" 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="amount">25</field>
 	<field name="amount_type">percent</field>
-	<field name="type_tax_use">purchase</field>
+	<field name="type_tax_use">sale</field>
 	<field name="account_id" ref="chart2701"/>
 	<field name="refund_account_id" ref="chart2701"/>
 	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_ut25')])]"/>
 </record>
 <record id="tax2" model="account.tax.template">
 	<field name="chart_template_id" ref="no_chart_template"/>
-	<field name="name">Utgående 14% mva</field>
-	<field name="description">Utgående 14% mva</field>
-	<field name="amount">14</field>
+	<field name="name">Utgående 15% mva</field>
+	<field name="description">Utgående 15% mva</field>
+	<field name="amount">15</field>
 	<field name="amount_type">percent</field>
-	<field name="type_tax_use">purchase</field>
+	<field name="type_tax_use">sale</field>
 	<field name="account_id" ref="chart2703"/>
 	<field name="refund_account_id" ref="chart2703"/>
-	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_ut14')])]"/>
+	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_ut15')])]"/>
 </record>
 <record id="tax3" model="account.tax.template">
 	<field name="chart_template_id" ref="no_chart_template"/>
@@ -56,7 +67,7 @@
 	<field name="description">Utgående 8% mva</field>
 	<field name="amount">8</field>
 	<field name="amount_type">percent</field>
-	<field name="type_tax_use">purchase</field>
+	<field name="type_tax_use">sale</field>
 	<field name="account_id" ref="chart2704"/>
 	<field name="refund_account_id" ref="chart2704"/>
 	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_ut8')])]"/>
@@ -67,21 +78,21 @@
 	<field name="description">Inngående 25% mva</field>
 	<field name="amount">25</field>
 	<field name="amount_type">percent</field>
-	<field name="type_tax_use">sale</field>
+	<field name="type_tax_use">purchase</field>
 	<field name="account_id" ref="chart2711"/>
 	<field name="refund_account_id" ref="chart2711"/>
 	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_in25')])]"/>
 </record>
 <record id="tax5" model="account.tax.template">
 	<field name="chart_template_id" ref="no_chart_template"/>
-	<field name="name">Inngående 14% mva</field>
-	<field name="description">Inngående 14% mva</field>
-	<field name="amount">14</field>
+	<field name="name">Inngående 15% mva</field>
+	<field name="description">Inngående 15% mva</field>
+	<field name="amount">15</field>
 	<field name="amount_type">percent</field>
-	<field name="type_tax_use">sale</field>
+	<field name="type_tax_use">purchase</field>
 	<field name="account_id" ref="chart2713"/>
 	<field name="refund_account_id" ref="chart2713"/>
-	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_ut14')])]"/>
+	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_in15')])]"/>
 </record>
 <record id="tax6" model="account.tax.template">
 	<field name="chart_template_id" ref="no_chart_template"/>
@@ -89,10 +100,35 @@
 	<field name="description">Inngående 8% mva</field>
 	<field name="amount">8</field>
 	<field name="amount_type">percent</field>
-	<field name="type_tax_use">sale</field>
+	<field name="type_tax_use">purchase</field>
 	<field name="account_id" ref="chart2714"/>
 	<field name="refund_account_id" ref="chart2714"/>
-	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_ut8')])]"/>
+	<field name="tag_ids" eval="[(6,0,[ref('tax_tag_in8')])]"/>
 </record>
+
+<record id="tax7" 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="amount_type">percent</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="account_id" ref="chart2714"/>
+        <field name="refund_account_id" ref="chart2714"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_in0')])]"/>
+</record>
+
+<record id="tax8" 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="amount_type">percent</field>
+        <field name="type_tax_use">sale</field>
+        <field name="account_id" ref="chart2704"/>
+        <field name="refund_account_id" ref="chart2704"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_ut0')])]"/>
+</record>
+
 </data>
 </openerp>