diff --git a/addons/l10n_pl/data/account.account.template.csv b/addons/l10n_pl/data/account.account.template.csv
index 5e0f447ff45..b178758a5b7 100644
--- a/addons/l10n_pl/data/account.account.template.csv
+++ b/addons/l10n_pl/data/account.account.template.csv
@@ -63,25 +63,25 @@
"chart20000000","Rozrachunki z odbiorcami","20-000-000","l10n_pl.pl_chart_template","account.data_account_type_receivable","True"
"chart20000100","Rozrachunki z odbiorcami (PoS)","20-000-100","l10n_pl.pl_chart_template","account.data_account_type_receivable","True"
"chart21000000","Rozrachunki z dostawcami","21-000-000","l10n_pl.pl_chart_template","account.data_account_type_payable","True"
-"chart22010000","Rozrachunki z urzędem skarbowym z tytułu VAT","22-010-000","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22020100","Rozliczenie naliczonego VAT 22%","22-020-100","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22020200","Rozliczenie naliczonego VAT 7%","22-020-200","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22020300","Rozliczenie naliczonego VAT 3%","22-020-300","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22020400","Rozliczenie naliczonego VAT 23%","22-020-400","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22020500","Rozliczenie naliczonego VAT 8%","22-020-500","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22020600","Rozliczenie naliczonego VAT 5%","22-020-600","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22030100","Rozliczenie należnego VAT 22%","22-030-100","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22030200","Rozliczenie należnego VAT 7%","22-030-200","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22030300","Rozliczenie należnego VAT 3%","22-030-300","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22030400","Rozliczenie należnego VAT 23%","22-030-400","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22030500","Rozliczenie należnego VAT 8%","22-030-500","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22030600","Rozliczenie należnego VAT 5%","22-030-600","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22040000","Pozostałe rozrachunki publicznoprawne","22-040-000","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22040100","Pozostałe rozrachunki z urzędem skarbowym","22-040-100","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22040200","Rozrachunki publicznoprawne z urzędem miasta/gminy","22-040-200","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22040300","Rozrachunki publicznoprawne z urzędem celnym","22-040-300","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22040400","Rozrachunki publicznoprawne z ZUS","22-040-400","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart22040500","Rozrachunki publicznoprawne z PFRON","22-040-500","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
+"chart22010000","Rozrachunki z urzędem skarbowym z tytułu VAT","22-010-000","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart22020100","Rozliczenie naliczonego VAT 22%","22-020-100","l10n_pl.pl_chart_template","account.data_account_type_current_assets","False"
+"chart22020200","Rozliczenie naliczonego VAT 7%","22-020-200","l10n_pl.pl_chart_template","account.data_account_type_current_assets","False"
+"chart22020300","Rozliczenie naliczonego VAT 3%","22-020-300","l10n_pl.pl_chart_template","account.data_account_type_current_assets","False"
+"chart22020400","Rozliczenie naliczonego VAT 23%","22-020-400","l10n_pl.pl_chart_template","account.data_account_type_current_assets","False"
+"chart22020500","Rozliczenie naliczonego VAT 8%","22-020-500","l10n_pl.pl_chart_template","account.data_account_type_current_assets","False"
+"chart22020600","Rozliczenie naliczonego VAT 5%","22-020-600","l10n_pl.pl_chart_template","account.data_account_type_current_assets","False"
+"chart22030100","Rozliczenie należnego VAT 22%","22-030-100","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart22030200","Rozliczenie należnego VAT 7%","22-030-200","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart22030300","Rozliczenie należnego VAT 3%","22-030-300","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart22030400","Rozliczenie należnego VAT 23%","22-030-400","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart22030500","Rozliczenie należnego VAT 8%","22-030-500","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart22030600","Rozliczenie należnego VAT 5%","22-030-600","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart22040000","Pozostałe rozrachunki publicznoprawne","22-040-000","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart22040100","Pozostałe rozrachunki z urzędem skarbowym","22-040-100","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart22040200","Rozrachunki publicznoprawne z urzędem miasta/gminy","22-040-200","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart22040300","Rozrachunki publicznoprawne z urzędem celnym","22-040-300","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart22040400","Rozrachunki publicznoprawne z ZUS","22-040-400","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart22040500","Rozrachunki publicznoprawne z PFRON","22-040-500","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
"chart23010000","Rozrachunki z tytułu wynagrodzeń","23-010-000","l10n_pl.pl_chart_template","l10n_pl.account_type_settlement","False"
"chart23020000","Rozrachunki z tytułu pożyczek udzielonych pracownikom","23-020-000","l10n_pl.pl_chart_template","l10n_pl.account_type_settlement","False"
"chart23090000","Inne rozrachunki z pracownikami","23-090-000","l10n_pl.pl_chart_template","l10n_pl.account_type_settlement","False"
@@ -255,5 +255,5 @@
"chart85020200","Fundusz nagród","85-020-200","l10n_pl.pl_chart_template","l10n_pl.account_type_settlement","False"
"chart85020300","Fundusz na remont zasobów mieszkaniowych","85-020-300","l10n_pl.pl_chart_template","l10n_pl.account_type_settlement","False"
"chart86000000","Wynik finansowy","86-000-000","l10n_pl.pl_chart_template","account.data_account_type_current_assets","False"
-"chart87010000","Podatek dochodowy od osób prawnych","87-010-000","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
-"chart87020000","Inne obowiązkowe obciążenia wyniku finansowego","87-020-000","l10n_pl.pl_chart_template","l10n_pl.account_type_tax","False"
+"chart87010000","Podatek dochodowy od osób prawnych","87-010-000","l10n_pl.pl_chart_template","account.data_account_type_current_liabilities","False"
+"chart87020000","Inne obowiązkowe obciążenia wyniku finansowego","87-020-000","l10n_pl.pl_chart_template","account.data_account_type_current_assets","False"
diff --git a/addons/l10n_pl/data/l10n_pl_chart_data.xml b/addons/l10n_pl/data/l10n_pl_chart_data.xml
index 2c6294e123c..eabf177a788 100644
--- a/addons/l10n_pl/data/l10n_pl_chart_data.xml
+++ b/addons/l10n_pl/data/l10n_pl_chart_data.xml
@@ -3,10 +3,6 @@
-
- Podatki
- off_balance
-
Rozrachunki