[MERGE] forward port of branch saas-9 up to 30864b6

5 files changed, 31 insertions, 5 deletions

diff --git a/addons/l10n_au/data/account.account.tag.csv b/addons/l10n_au/data/account.account.tag.csv
index c3f40d4850d..4cf9e1cfce2 100644
--- a/addons/l10n_au/data/account.account.tag.csv
+++ b/addons/l10n_au/data/account.account.tag.csv
@@ -3,9 +3,14 @@ tag_au_tax_sale_10,Taxable Sales Ex-GST,taxes
 tag_au_tax_sale_inc_10,Taxable Sales Inc-GST,taxes
 tag_au_tax_sale_0,Tax Exclusive Sales,taxes
 tag_au_tax_sale_exempt,Tax Exempt Sales,taxes
+tag_au_tax_sale_input,Input Taxed Sales,taxes
+tag_au_tax_sale_adj,Adjustments (Sales),taxes
 tag_au_tax_purchase_10,Taxable Purchases Ex-GST,taxes
 tag_au_tax_purchase_inc_10,Taxable Purchases Inc-GST,taxes
 tag_au_tax_purchase_capital,Capital Purchases Ex-GST,taxes
 tag_au_tax_purchase_0,Tax Exempt Purchases,taxes
 tag_au_tax_purchase_taxable_import,Taxable Import without GST,taxes
+tag_au_tax_purchase_input,Purchases for Input Taxed Sales,taxes
+tag_au_tax_purchase_private,Purchases for Private Use,taxes
 tag_au_tax_purchase_gst_only,GST Payment for Taxable Imports,taxes
+tag_au_tax_purchase_adj,Adjustments (Purchases),taxes
diff --git a/addons/l10n_au/data/account.account.template.csv b/addons/l10n_au/data/account.account.template.csv
index 065cd900578..af098ee83f1 100644
--- a/addons/l10n_au/data/account.account.template.csv
+++ b/addons/l10n_au/data/account.account.template.csv
@@ -8,6 +8,7 @@ au_11200,l10n_au.l10n_au_chart_template,11200,Trade Debtors,account.data_account
 au_11210,l10n_au.l10n_au_chart_template,11210,Less Prov'n for Doubtful Debts,account.data_account_type_current_assets,FALSE
 au_11310,l10n_au.l10n_au_chart_template,11310,Raw Materials,account.data_account_type_current_assets,FALSE
 au_11320,l10n_au.l10n_au_chart_template,11320,Finished Goods,account.data_account_type_current_assets,FALSE
+au_11330,l10n_au.l10n_au_chart_template,11330,Trading Stock on Hand,account.data_account_type_current_assets,FALSE
 au_12100,l10n_au.l10n_au_chart_template,12100,Deposits Paid,account.data_account_type_prepayments,FALSE
 au_12200,l10n_au.l10n_au_chart_template,12200,Prepaid Insurance,account.data_account_type_current_assets,FALSE
 au_13110,l10n_au.l10n_au_chart_template,13110,Manufacturing Plant at Cost,account.data_account_type_fixed_assets,FALSE
diff --git a/addons/l10n_au/data/account.tax.template.csv b/addons/l10n_au/data/account.tax.template.csv
index 8d630836f8a..fcded91aab6 100644
--- a/addons/l10n_au/data/account.tax.template.csv
+++ b/addons/l10n_au/data/account.tax.template.csv
@@ -1,11 +1,16 @@
 id,chart_template_id:id,name,sequence,description,type_tax_use,amount_type,amount,price_include,account_id:id,refund_account_id:id,tag_ids:id
 au_tax_sale_10,l10n_au_chart_template,Sale (10%),1,GST Sales,sale,percent,10,FALSE,au_21310,au_21310,tag_au_tax_sale_10
 au_tax_sale_inc_10,l10n_au_chart_template,GST Inc Sale (10%),2,GST Inclusive Sales,sale,percent,10,TRUE,au_21310,au_21310,tag_au_tax_sale_inc_10
-au_tax_sale_0,l10n_au_chart_template,Zero (Export) Sale,3,Zero Rated (Export) Sales,sale,percent,0,FALSE,au_21310,au_21310,tag_au_tax_sale_0
-au_tax_sale_exempt,l10n_au_chart_template,Exempt Sale,4,Exempt Sales,sale,percent,0,FALSE,au_21310,au_21310,tag_au_tax_sale_exempt
+au_tax_sale_0,l10n_au_chart_template,Zero (Export) Sale,3,Zero Rated (Export) Sales,sale,percent,0,FALSE,,,tag_au_tax_sale_0
+au_tax_sale_exempt,l10n_au_chart_template,Exempt Sale,4,Exempt Sales,sale,percent,0,FALSE,,,tag_au_tax_sale_exempt
+au_tax_sale_input,l10n_au_chart_template,Input Taxed,5,Input Taxed Sales,sale,percent,0,FALSE,,,tag_au_tax_sale_input
+au_tax_sale_adj,l10n_au_chart_template,Sale Adj (10%),6,Tax Adjustments (Sales),sale,percent,10,FALSE,au_21310,au_21310,tag_au_tax_sale_adj
 au_tax_purchase_10,l10n_au_chart_template,Purch (10%),1,GST Purchases,purchase,percent,10,FALSE,au_21330,au_21330,tag_au_tax_purchase_10
 au_tax_purchase_inc_10,l10n_au_chart_template,GST Inc Purch (10%),2,GST Inclusive Purchases,purchase,percent,10,TRUE,au_21330,au_21330,tag_au_tax_purchase_inc_10
 au_tax_purchase_capital,l10n_au_chart_template,Capital (10.0%),3,Capital Purchases,purchase,percent,10,FALSE,au_21330,au_21330,tag_au_tax_purchase_capital
-au_tax_purchase_0,l10n_au_chart_template,Zero Rated Purch,4,Zero Rated Purchases,purchase,percent,0,FALSE,au_21330,au_21330,tag_au_tax_purchase_0
-au_tax_purchase_taxable_import,l10n_au_chart_template,Purch (Taxable Imports),5,Purchase (Taxable Imports) - Tax Paid Separately,purchase,percent,0,FALSE,au_21330,au_21330,tag_au_tax_purchase_taxable_import
-au_tax_purchase_gst_only,l10n_au_chart_template,GST Only on Imports,6,GST Only on Imports,purchase,percent,100000000,TRUE,au_21330,au_21330,tag_au_tax_purchase_gst_only
+au_tax_purchase_0,l10n_au_chart_template,Zero Rated Purch,4,Zero Rated Purchases,purchase,percent,0,FALSE,,,tag_au_tax_purchase_0
+au_tax_purchase_taxable_import,l10n_au_chart_template,Purch (Taxable Imports),5,Purchase (Taxable Imports) - Tax Paid Separately,purchase,percent,0,FALSE,,,tag_au_tax_purchase_taxable_import
+au_tax_purchase_input,l10n_au_chart_template,Purch for Input Sales,6,Purchases for Input Taxed Sales,purchase,percent,10,FALSE,,,tag_au_tax_purchase_input
+au_tax_purchase_private,l10n_au_chart_template,Purch Private (10%) ,7,Purchases for Private use or not deductible,purchase,percent,10,FALSE,,,tag_au_tax_purchase_private
+au_tax_purchase_gst_only,l10n_au_chart_template,GST Only on Imports,8,GST Only on Imports,purchase,percent,100000000,TRUE,au_21330,au_21330,tag_au_tax_purchase_gst_only
+au_tax_purchase_adj,l10n_au_chart_template,Purch Adj (10%),9,Tax Adjustments (Purchases),purchase,percent,10,FALSE,au_21330,au_21330,tag_au_tax_purchase_adj
diff --git a/addons/l10n_au/data/account_chart_template_refs.xml b/addons/l10n_au/data/account_chart_template_refs.xml
index 131697e3391..616d991a1ac 100644
--- a/addons/l10n_au/data/account_chart_template_refs.xml
+++ b/addons/l10n_au/data/account_chart_template_refs.xml
@@ -6,6 +6,9 @@
         <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_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"/>
     </record>
diff --git a/addons/l10n_au/data/account_fiscal_position_tax_template.xml b/addons/l10n_au/data/account_fiscal_position_tax_template.xml
index 2f102292a3a..c02a0b71717 100644
--- a/addons/l10n_au/data/account_fiscal_position_tax_template.xml
+++ b/addons/l10n_au/data/account_fiscal_position_tax_template.xml
@@ -12,12 +12,24 @@
             <field name="tax_dest_id" ref="au_tax_sale_0"/>
         </record>
 
+        <record id="fiscal_position_tax_template_os_partner_sale2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_os_partner"/>
+            <field name="tax_src_id" ref="au_tax_sale_inc_10"/>
+            <field name="tax_dest_id" ref="au_tax_sale_0"/>
+        </record>
+
         <record id="fiscal_position_tax_template_os_partner_purch1" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_os_partner"/>
             <field name="tax_src_id" ref="au_tax_purchase_10"/>
             <field name="tax_dest_id" ref="au_tax_purchase_0"/>
         </record>
 
+        <record id="fiscal_position_tax_template_os_partner_purch3" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_os_partner"/>
+            <field name="tax_src_id" ref="au_tax_purchase_inc_10"/>
+            <field name="tax_dest_id" ref="au_tax_purchase_0"/>
+        </record>
+
         <record id="fiscal_position_tax_template_os_partner_purch2" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_os_partner"/>
             <field name="tax_src_id" ref="au_tax_purchase_capital"/>