From d387f3d0d50b3e77283b59461710c145c7edb3d1 Mon Sep 17 00:00:00 2001 From: "Nicolas Viseur (vin)" Date: Thu, 1 Feb 2024 09:47:01 +0800 Subject: [PATCH] [IMP] l10n_nz: onboarding improvement This tasks aims to improve the out-of-the-box configuration of the NZ localization by updating some tax groups, taxes, accounts and default COA settings. Task ids 3647518 & 3647460 closes odoo/odoo#154541 Signed-off-by: Olivier Colson (oco) --- addons/l10n_nz/__manifest__.py | 2 +- addons/l10n_nz/data/account_tax_report_data.xml | 2 +- addons/l10n_nz/data/template/account.account-nz.csv | 6 ++++-- addons/l10n_nz/data/template/account.tax-nz.csv | 4 ++-- addons/l10n_nz/data/template/account.tax.group-nz.csv | 9 ++++----- addons/l10n_nz/models/template_nz.py | 8 +++++++- odoo/addons/base/data/res_country_data.xml | 2 +- 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/addons/l10n_nz/__manifest__.py b/addons/l10n_nz/__manifest__.py index 17499d494f8..607bafead1e 100644 --- a/addons/l10n_nz/__manifest__.py +++ b/addons/l10n_nz/__manifest__.py @@ -15,7 +15,7 @@ Also: - activates a number of regional currencies. - sets up New Zealand taxes. """, - 'author': 'Richard deMeester - Willow IT', + 'author': 'Odoo S.A., Richard deMeester - Willow IT', 'website': 'https://www.odoo.com/documentation/17.0/applications/finance/fiscal_localizations.html', 'depends': [ 'account', diff --git a/addons/l10n_nz/data/account_tax_report_data.xml b/addons/l10n_nz/data/account_tax_report_data.xml index b496f68f77a..2da4e3430db 100644 --- a/addons/l10n_nz/data/account_tax_report_data.xml +++ b/addons/l10n_nz/data/account_tax_report_data.xml @@ -1,7 +1,7 @@ - Tax Report + GST Report diff --git a/addons/l10n_nz/data/template/account.account-nz.csv b/addons/l10n_nz/data/template/account.account-nz.csv index 68e1c8c50e4..0cb690c100c 100644 --- a/addons/l10n_nz/data/template/account.account-nz.csv +++ b/addons/l10n_nz/data/template/account.account-nz.csv @@ -10,7 +10,8 @@ "nz_11310","11310","Raw Materials","asset_current","False" "nz_11320","11320","Finished Goods","asset_current","False" "nz_11330","11330","Trading Stock on Hand","asset_current","False" -"nz_11340","11340","Goods Shipped Not Invoiced","asset_current","False" +"nz_11340","11340","Goods Shipped not Invoiced","asset_current","False" +"nz_11350","11350","Work In Process (Inventory)","asset_current","False" "nz_12100","12100","Deposits Paid","asset_prepayments","False" "nz_12200","12200","Prepaid Insurance","asset_current","False" "nz_13110","13110","Manufacturing Plant at Cost","asset_fixed","False" @@ -25,8 +26,9 @@ "nz_13420","13420","Motor Vehicles Accum Dep","asset_fixed","False" "nz_21110","21110","Credit Card","liability_current","False" "nz_21200","21200","Trade Creditors","liability_payable","True" -"nz_21210","21210","A/P Accrual - Inventory","liability_current","False" +"nz_21210","21210","Goods Received not Billed","liability_current","False" "nz_21310","21310","GST Collected","liability_current","False" +"nz_21320","21320","GST Payments","liability_current","False" "nz_21330","21330","GST Paid","asset_current","False" "nz_21350","21350","Fuel Tax Credits Accrued","liability_current","False" "nz_21360","21360","Import Duty Payable","liability_current","False" diff --git a/addons/l10n_nz/data/template/account.tax-nz.csv b/addons/l10n_nz/data/template/account.tax-nz.csv index a9e894c5da0..4a04251db5b 100644 --- a/addons/l10n_nz/data/template/account.tax-nz.csv +++ b/addons/l10n_nz/data/template/account.tax-nz.csv @@ -1,5 +1,5 @@ "id","name","sequence","description","invoice_label","type_tax_use","amount_type","amount","price_include","tax_group_id","repartition_line_ids/repartition_type","repartition_line_ids/document_type","repartition_line_ids/tag_ids","repartition_line_ids/account_id" -"nz_tax_sale_15","15%","1","Sale (15%)","GST Sales","sale","percent","15.0","False","tax_group_15","base","invoice","+BOX 5","" +"nz_tax_sale_15","15%","1","Sale (15%)","GST Sales","sale","percent","15.0","False","tax_group_gst_15","base","invoice","+BOX 5","" "","","","","","","","","","","tax","invoice","+BOX 5","nz_21310" "","","","","","","","","","","base","refund","-BOX 5","" "","","","","","","","","","","tax","refund","-BOX 5","nz_21310" @@ -11,7 +11,7 @@ "","","","","","","","","","","tax","invoice","","" "","","","","","","","","","","base","refund","-BOX 5||-BOX 6","" "","","","","","","","","","","tax","refund","","" -"nz_tax_purchase_15","15%","1","Purch (15%)","GST Purchases","purchase","percent","15.0","False","tax_group_15","base","invoice","+BOX 11","" +"nz_tax_purchase_15","15%","1","Purch (15%)","GST Purchases","purchase","percent","15.0","False","tax_group_gst_15","base","invoice","+BOX 11","" "","","","","","","","","","","tax","invoice","+BOX 11","nz_21330" "","","","","","","","","","","base","refund","-BOX 11","" "","","","","","","","","","","tax","refund","-BOX 11","nz_21330" diff --git a/addons/l10n_nz/data/template/account.tax.group-nz.csv b/addons/l10n_nz/data/template/account.tax.group-nz.csv index 1ecd0edf64b..23e8bca285a 100644 --- a/addons/l10n_nz/data/template/account.tax.group-nz.csv +++ b/addons/l10n_nz/data/template/account.tax.group-nz.csv @@ -1,5 +1,4 @@ -"id","name","country_id" -"tax_group_0","TAX 0%","base.nz" -"tax_group_gst_15","GST 15%","base.nz" -"tax_group_15","TAX 15%","base.nz" -"tax_group_100","GST 100%","base.nz" +"id","name","country_id","tax_payable_account_id","tax_receivable_account_id" +"tax_group_0","GST 0%","base.nz","nz_21320","nz_21320" +"tax_group_gst_15","GST 15%","base.nz","nz_21320","nz_21320" +"tax_group_100","GST 100%","base.nz","nz_21320","nz_21320" diff --git a/addons/l10n_nz/models/template_nz.py b/addons/l10n_nz/models/template_nz.py index 605510e9783..5c810862642 100644 --- a/addons/l10n_nz/models/template_nz.py +++ b/addons/l10n_nz/models/template_nz.py @@ -1,5 +1,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import models +from odoo import models, fields from odoo.addons.account.models.chart_template import template @@ -17,6 +17,7 @@ class AccountChartTemplate(models.AbstractModel): 'property_stock_account_input_categ_id': 'nz_21210', 'property_stock_account_output_categ_id': 'nz_11340', 'property_stock_valuation_account_id': 'nz_11330', + 'property_stock_account_production_cost_id': 'nz_11350', } @template('nz', 'res.company') @@ -35,5 +36,10 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'nz_61620', 'account_sale_tax_id': 'nz_tax_sale_15', 'account_purchase_tax_id': 'nz_tax_purchase_15', + 'fiscalyear_last_month': '3', + 'fiscalyear_last_day': 31, + # Changing the opening date to the first day of the fiscal year. + # This way the opening entries will be set to the 31st of March. + 'account_opening_date': fields.Date.context_today(self).replace(month=4, day=1), }, } diff --git a/odoo/addons/base/data/res_country_data.xml b/odoo/addons/base/data/res_country_data.xml index f218c3f5726..72d8bb9773e 100644 --- a/odoo/addons/base/data/res_country_data.xml +++ b/odoo/addons/base/data/res_country_data.xml @@ -1093,7 +1093,7 @@ nz - IRD/GST + GST Oman