From 5d70e17c1778cdd0feae7a7f1e9032f2bca487a8 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 2 Dec 2019 11:27:17 +0000
Subject: [PATCH] [FIX] l10n_nz: adapt nz tax report to the multiple tax report
 model

closes odoo/odoo#41291

X-original-commit: 81eb531009ccc7acc11ef18791e5bb7f9fee16ae
Signed-off-by: Josse Colpaert <jco@openerp.com>
---
 .../l10n_nz/data/account_tax_report_data.xml  | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/addons/l10n_nz/data/account_tax_report_data.xml b/addons/l10n_nz/data/account_tax_report_data.xml
index 8b889cb8cc2..cf9136bb664 100644
--- a/addons/l10n_nz/data/account_tax_report_data.xml
+++ b/addons/l10n_nz/data/account_tax_report_data.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="tax_report" model="account.tax.report">
+        <field name="name">Tax Report</field>
+        <field name="country_id" ref="base.nz"/>
+    </record>
+
     <record id="tax_report_sale_and_income" model="account.tax.report.line">
         <field name="name">Sales and Income</field>
         <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_box5" model="account.tax.report.line">
@@ -13,7 +18,7 @@
         <field name="parent_id" ref="tax_report_sale_and_income"/>
         <field name="sequence" eval="1"/>
         <field name="code">NZBOX5</field>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_box6" model="account.tax.report.line">
@@ -22,7 +27,7 @@
         <field name="parent_id" ref="tax_report_sale_and_income"/>
         <field name="sequence" eval="2"/>
         <field name="code">NZBOX6</field>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_box7" model="account.tax.report.line">
@@ -30,7 +35,7 @@
         <field name="parent_id" ref="tax_report_sale_and_income"/>
         <field name="sequence" eval="3"/>
         <field name="formula">NZBOX5 - NZBOX6</field>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_box8" model="account.tax.report.line">
@@ -38,7 +43,7 @@
         <field name="parent_id" ref="tax_report_sale_and_income"/>
         <field name="sequence" eval="4"/>
         <field name="formula">((NZBOX5 - NZBOX6) * 3)/23</field>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_box9" model="account.tax.report.line">
@@ -48,7 +53,7 @@
         <field name="sequence" eval="5"/>
         <field name="code">NZBOX9</field>
         <field name="formula"></field>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_box10" model="account.tax.report.line">
@@ -56,13 +61,13 @@
         <field name="parent_id" ref="tax_report_sale_and_income"/>
         <field name="sequence" eval="6"/>
         <field name="formula">(((NZBOX5 - NZBOX6) * 3)/23) + NZBOX9</field>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_purchases_and_expenses" model="account.tax.report.line">
         <field name="name">Purchases and Expenses</field>
         <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_box11" model="account.tax.report.line">
@@ -71,7 +76,7 @@
         <field name="parent_id" ref="tax_report_purchases_and_expenses"/>
         <field name="sequence" eval="1"/>
         <field name="code">NZBOX11</field>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_box12" model="account.tax.report.line">
@@ -79,14 +84,14 @@
         <field name="parent_id" ref="tax_report_purchases_and_expenses"/>
         <field name="sequence" eval="2"/>
         <field name="formula">(NZBOX11 * 3)/23</field>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_box13" model="account.tax.report.line">
         <field name="name">[BOX 13] Credit adjustments from your calculation sheet</field>
         <field name="parent_id" ref="tax_report_purchases_and_expenses"/>
         <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_box14" model="account.tax.report.line">
@@ -94,14 +99,14 @@
         <field name="parent_id" ref="tax_report_purchases_and_expenses"/>
         <field name="sequence" eval="4"/>
         <field name="formula">((NZBOX11 * 3)/23)</field>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
     <record id="tax_report_box15" model="account.tax.report.line">
         <field name="name">[BOX 15]  Difference between BOX10 and BOX14</field>
         <field name="sequence" eval="3"/>
         <field name="formula">((((NZBOX5 - NZBOX6) * 3)/23) + NZBOX9) - ((NZBOX11 * 3)/23)</field>
-        <field name="country_id" ref="base.nz"/>
+        <field name="report_id" ref="tax_report"/>
     </record>
 
 </odoo>