From fe24bab8d2f3e36e47fde575032e836ac9ff205f Mon Sep 17 00:00:00 2001
From: ArnaudVerlaine <arve@odoo.com>
Date: Fri, 28 Oct 2022 10:14:12 +0000
Subject: [PATCH] [FIX] l10n_au: fixes the default accounts

- Adds a new default income account for the exchange rate gain
- Changes the default stock output account
- Use anglo-saxon accounting by default
Task-2990419
Task-2988876

closes odoo/odoo#104699

X-original-commit: fc5fa681638b2af63a64fcd83cdf50df92bcd111
Signed-off-by: Josse Colpaert <jco@odoo.com>
---
 addons/l10n_au/data/account.account.template.csv    | 4 +++-
 addons/l10n_au/data/account_chart_template_data.xml | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_au/data/account.account.template.csv b/addons/l10n_au/data/account.account.template.csv
index 337bf07fbd3..2073f7a95a3 100644
--- a/addons/l10n_au/data/account.account.template.csv
+++ b/addons/l10n_au/data/account.account.template.csv
@@ -10,6 +10,7 @@ au_11210,l10n_au.l10n_au_chart_template,11210,Less Prov'n for Doubtful Debts,ass
 au_11310,l10n_au.l10n_au_chart_template,11310,Raw Materials,asset_current,FALSE
 au_11320,l10n_au.l10n_au_chart_template,11320,Finished Goods,asset_current,FALSE
 au_11330,l10n_au.l10n_au_chart_template,11330,Trading Stock on Hand,asset_current,FALSE
+au_11340,l10n_au.l10n_au_chart_template,11340,Goods Shipped Not Invoiced,asset_current,FALSE
 au_12100,l10n_au.l10n_au_chart_template,12100,Deposits Paid,asset_prepayments,FALSE
 au_12200,l10n_au.l10n_au_chart_template,12200,Prepaid Insurance,asset_current,FALSE
 au_13110,l10n_au.l10n_au_chart_template,13110,Manufacturing Plant at Cost,asset_fixed,FALSE
@@ -68,7 +69,8 @@ au_61300,l10n_au.l10n_au_chart_template,61300,Commissions Paid,expense,FALSE
 au_61500,l10n_au.l10n_au_chart_template,61500,Depreciation Expense,expense_depreciation,FALSE
 au_61610,l10n_au.l10n_au_chart_template,61610,Discounts Given,expense,FALSE
 au_61620,l10n_au.l10n_au_chart_template,61620,Discounts Taken,expense,FALSE
-au_61630,l10n_au.l10n_au_chart_template,61630,Exchange Rate Losses (Gains),expense,FALSE
+au_61630,l10n_au.l10n_au_chart_template,61630,Exchange Rate Loss,expense,FALSE
+au_61640,l10n_au.l10n_au_chart_template,61640,Exchange Rate Gain,income,FALSE
 au_61700,l10n_au.l10n_au_chart_template,61700,Freight Paid,expense,FALSE
 au_61800,l10n_au.l10n_au_chart_template,61800,Insurance,expense,FALSE
 au_61910,l10n_au.l10n_au_chart_template,61910,Overdraft Interest,expense,FALSE
diff --git a/addons/l10n_au/data/account_chart_template_data.xml b/addons/l10n_au/data/account_chart_template_data.xml
index 2fa6eaf64a3..fffe26832c7 100644
--- a/addons/l10n_au/data/account_chart_template_data.xml
+++ b/addons/l10n_au/data/account_chart_template_data.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <record id="l10n_au_chart_template" model="account.chart.template">
+        <field name="use_anglo_saxon" eval="True"/>
         <field name="property_account_receivable_id" ref="au_11200"/>
         <field name="property_account_payable_id" ref="au_21200"/>
         <field name="property_account_expense_categ_id" ref="au_51110"/>
         <field name="property_account_income_categ_id" ref="au_41110"/>
         <field name="property_stock_account_input_categ_id" ref="au_21210"/>
-        <field name="property_stock_account_output_categ_id" ref="au_51110"/>
+        <field name="property_stock_account_output_categ_id" ref="au_11340"/>
         <field name="property_stock_valuation_account_id" ref="au_11330"/>
         <field name="expense_currency_exchange_account_id" ref="au_61630"/>
-        <field name="income_currency_exchange_account_id" ref="au_61630"/>
+        <field name="income_currency_exchange_account_id" ref="au_61640"/>
         <field name="default_pos_receivable_account_id" ref="au_11201" />
         <field name="account_journal_early_pay_discount_loss_account_id" ref="au_61610"/>
         <field name="account_journal_early_pay_discount_gain_account_id" ref="au_61620"/>