summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard deMeester <richard@willowit.com.au>2016-08-03 13:41:30 +1000
committerNicolas Martinelli <nim@odoo.com>2016-08-03 10:57:54 +0200
commite401a0bbbb20b36d6041ffc3da05bcbaa0990994 (patch)
tree5ba2c32e3d41392b2d67ba0776008065919bf0c8
parent28bf5b1507c6ba9f65ee7fd5fd704dafbec9928a (diff)
[FIX] l10n_au, l10n_nz: account definitions
Change default definitions of funds clearing accounts to be assets instead of liquidity. Without this fix, reconciling to these accounts during bank reconciliation is not generating the correct journal, but is treating the process as a matching step (which it is not). For existing data, the accounts will need to be manually changed from liquidity to current assets. Closes #12996
-rw-r--r--addons/l10n_au/data/account.account.template.csv4
-rw-r--r--addons/l10n_nz/data/account.account.template.csv4
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/l10n_au/data/account.account.template.csv b/addons/l10n_au/data/account.account.template.csv
index af098ee83f1..def5540b2e3 100644
--- a/addons/l10n_au/data/account.account.template.csv
+++ b/addons/l10n_au/data/account.account.template.csv
@@ -2,8 +2,8 @@ id,chart_template_id:id,code,name,user_type_id:id,reconcile
au_11110,l10n_au.l10n_au_chart_template,11110,Bank Account,account.data_account_type_liquidity,FALSE
au_11130,l10n_au.l10n_au_chart_template,11130,Petty Cash,account.data_account_type_liquidity,FALSE
au_11140,l10n_au.l10n_au_chart_template,11140,Cash Drawer,account.data_account_type_liquidity,FALSE
-au_11180,l10n_au.l10n_au_chart_template,11180,Undeposited Funds,account.data_account_type_liquidity,TRUE
-au_11190,l10n_au.l10n_au_chart_template,11190,Electronic Clearing Account,account.data_account_type_liquidity,TRUE
+au_11180,l10n_au.l10n_au_chart_template,11180,Undeposited Funds,account.data_account_type_current_assets,TRUE
+au_11190,l10n_au.l10n_au_chart_template,11190,Electronic Clearing Account,account.data_account_type_current_assets,TRUE
au_11200,l10n_au.l10n_au_chart_template,11200,Trade Debtors,account.data_account_type_receivable,TRUE
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
diff --git a/addons/l10n_nz/data/account.account.template.csv b/addons/l10n_nz/data/account.account.template.csv
index 2b6bd043627..4a6b135cfec 100644
--- a/addons/l10n_nz/data/account.account.template.csv
+++ b/addons/l10n_nz/data/account.account.template.csv
@@ -2,8 +2,8 @@ id,chart_template_id:id,code,name,user_type_id:id,reconcile
nz_11110,l10n_nz.l10n_nz_chart_template,11110,Bank Account,account.data_account_type_liquidity,FALSE
nz_11130,l10n_nz.l10n_nz_chart_template,11130,Petty Cash,account.data_account_type_liquidity,FALSE
nz_11140,l10n_nz.l10n_nz_chart_template,11140,Cash Drawer,account.data_account_type_liquidity,FALSE
-nz_11180,l10n_nz.l10n_nz_chart_template,11180,Undeposited Funds,account.data_account_type_liquidity,TRUE
-nz_11190,l10n_nz.l10n_nz_chart_template,11190,Electronic Clearing Account,account.data_account_type_liquidity,TRUE
+nz_11180,l10n_nz.l10n_nz_chart_template,11180,Undeposited Funds,account.data_account_type_current_assets,TRUE
+nz_11190,l10n_nz.l10n_nz_chart_template,11190,Electronic Clearing Account,account.data_account_type_current_assets,TRUE
nz_11200,l10n_nz.l10n_nz_chart_template,11200,Trade Debtors,account.data_account_type_receivable,TRUE
nz_11210,l10n_nz.l10n_nz_chart_template,11210,Less Prov'n for Doubtful Debts,account.data_account_type_current_assets,FALSE
nz_11310,l10n_nz.l10n_nz_chart_template,11310,Raw Materials,account.data_account_type_current_assets,FALSE