From 2b81f595cc89cc65fc1ab9beb88264147ef0df18 Mon Sep 17 00:00:00 2001
From: "Tommy (tong)" <tong@odoo.com>
Date: Thu, 23 Feb 2023 02:15:29 +0000
Subject: [PATCH] [IMP] l10n_au: update fiscal year last day, label display,
 etc

task-3187734

closes odoo/odoo#115163

X-original-commit: 65dacfc17bec5feba1216354c71ca542c1b762b2
Signed-off-by: Nicolas Viseur (vin) <vin@odoo.com>
---
 addons/l10n_au/__init__.py                 |  3 ---
 addons/l10n_au/__manifest__.py             | 10 ++++-----
 addons/l10n_au/models/__init__.py          |  1 +
 addons/l10n_au/models/template_au.py       |  2 ++
 addons/l10n_au/views/res_company_views.xml | 26 ++++++++++++++++++++++
 5 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 addons/l10n_au/views/res_company_views.xml

diff --git a/addons/l10n_au/__init__.py b/addons/l10n_au/__init__.py
index 6c1ddec21b0..d6210b1285d 100644
--- a/addons/l10n_au/__init__.py
+++ b/addons/l10n_au/__init__.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-# Copyright (C) 2015 Willow IT Pty Ltd (<http://www.willowit.com.au>).
-
 from . import models
diff --git a/addons/l10n_au/__manifest__.py b/addons/l10n_au/__manifest__.py
index 40c0cbf25a1..0a4eef4ec43 100644
--- a/addons/l10n_au/__manifest__.py
+++ b/addons/l10n_au/__manifest__.py
@@ -1,6 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 {
-    'name': 'Australian - Accounting',
+    'name': 'Australia - Accounting',
     'version': '1.1',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
@@ -13,17 +14,14 @@ Also:
     - activates a number of regional currencies.
     - sets up Australian taxes.
     """,
-    'author': 'Richard deMeester - Willow IT',
-    'website': 'http://www.willowit.com',
-    'depends': [
-        'account',
-    ],
+    'depends': ['account'],
     'data': [
         'data/account_tax_report_data.xml',
         'data/account_tax_template_data.xml',
         'data/res_currency_data.xml',
         'views/menuitems.xml',
         'views/report_invoice.xml',
+        'views/res_company_views.xml',
     ],
     'demo': [
         'demo/demo_company.xml',
diff --git a/addons/l10n_au/models/__init__.py b/addons/l10n_au/models/__init__.py
index dded69cef18..5116e46f472 100644
--- a/addons/l10n_au/models/__init__.py
+++ b/addons/l10n_au/models/__init__.py
@@ -1,3 +1,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 from . import template_au
 from . import account_move
diff --git a/addons/l10n_au/models/template_au.py b/addons/l10n_au/models/template_au.py
index 302e6e80dda..914e0b1119f 100644
--- a/addons/l10n_au/models/template_au.py
+++ b/addons/l10n_au/models/template_au.py
@@ -33,5 +33,7 @@ class AccountChartTemplate(models.AbstractModel):
                 'expense_currency_exchange_account_id': 'au_61630',
                 'account_journal_early_pay_discount_loss_account_id': 'au_61610',
                 'account_journal_early_pay_discount_gain_account_id': 'au_61620',
+                'fiscalyear_last_month': '6',
+                'fiscalyear_last_day': 30,
             },
         }
diff --git a/addons/l10n_au/views/res_company_views.xml b/addons/l10n_au/views/res_company_views.xml
new file mode 100644
index 00000000000..5bda46d1c43
--- /dev/null
+++ b/addons/l10n_au/views/res_company_views.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_company_form" model="ir.ui.view">
+        <field name="name">res.company.form.inherit.l10n_au</field>
+        <field name="model">res.company</field>
+        <field name="inherit_id" ref="base.view_company_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='vat']" position="attributes">
+                <attribute name="nolabel">1</attribute>
+            </xpath>
+            <field name="vat" position="before">
+                <label for="vat" attrs="{'invisible':[('country_code', '=', 'AU')]}" />
+                <label for="vat" string="ABN" attrs="{'invisible':[('country_code', '!=', 'AU')]}" />
+            </field>
+            <xpath expr="//field[@name='company_registry']" position="attributes">
+                <attribute name="nolabel">1</attribute>
+            </xpath>
+            <field name="company_registry" position="before">
+                <label for="company_registry" attrs="{'invisible':[('country_code', '=', 'AU')]}" />
+                <label for="company_registry" string="ACN" attrs="{'invisible':[('country_code', '!=', 'AU')]}" />
+            </field>
+        </field>
+    </record>
+
+</odoo>