[fix] l10n_et is back, compliant with the new accounting

10 files changed, 227 insertions, 187 deletions

diff --git a/addons/l10n_et/__openerp__.py b/addons/l10n_et/__openerp__.py
index a0737ffce74..39ed4801e67 100644
--- a/addons/l10n_et/__openerp__.py
+++ b/addons/l10n_et/__openerp__.py
@@ -22,20 +22,15 @@ This is the latest Ethiopian OpenERP localization and consists of:
     'depends': [
         'base_vat',
     ],
-    'init_xml': [
-        'data/account.account.type.csv',
+    'data': [
+        'data/account_chart_template.xml',
         'data/account.account.template.csv',
-        'data/account.chart.template.csv',
+        'data/set_account_on_chart_template.xml',
+        'data/account_account_tag.xml',
         'data/account.tax.template.csv',
+        'data/account_chart_template.yml',
         'data/res.country.state.csv',
     ],
-    'data': [
-        'l10n_et_wizard.xml',
-    ],
-    'test': [
-    ],
-    'demo': [
-    ],
-    'installable': False,
+    'installable': True,
     'active': False,
 }
diff --git a/addons/l10n_et/data/account.account.template.csv b/addons/l10n_et/data/account.account.template.csv
index 9410420dbeb..dff2bf6edf2 100644
--- a/addons/l10n_et/data/account.account.template.csv
+++ b/addons/l10n_et/data/account.account.template.csv
@@ -1,138 +1,98 @@
-"id","code","name","user_type:id","reconcile"
-"l10n_et0","0","Ethiopia","l10n_et_view",""
-"l10n_et1000","1000","REVENUE","l10n_et_view",""
-"l10n_et1100","1100","Sales of Goods and Services","l10n_et_income",""
-"l10n_et2000","2000","ASSETS","l10n_et_view",""
-"l10n_et2100","2100-2199","Cash and Cash Equivalents","l10n_et_view",""
-"l10n_et2102","2102","Cash at bank in foreigh currency","l10n_et_current_assets",""
-"l10n_et2104","2104","Letter of Credit restricted account","l10n_et_current_assets",""
-"l10n_et2440","2105","Investments current assets","l10n_et_view",""
-"l10n_et2110","2110","Cash on hand and at bank","l10n_et_view",""
-"l10n_et2200","2200-2299","Receivables","l10n_et_view",""
-"l10n_et220119","2201-2219","Accounts Receivable","l10n_et_view",""
-"l10n_et2201","2201","Suspense","l10n_et_receivable",""
-"l10n_et2202","2202","Cash shortage","l10n_et_receivable",""
-"l10n_et2203","2203","Advance to staff","l10n_et_receivable",""
-"l10n_et2204","2204","Cash Registers","l10n_et_receivable",""
-"l10n_et2211","2211","Trade Debtors","l10n_et_receivable","True"
-"l10n_et2212","2212","VAT Receivable on Purchases","l10n_et_input_tax",""
-"l10n_et2213","2213","Withholding Receivable on Sales","l10n_et_input_tax",""
-"l10n_et2214","2214","VAT Withholding Receivable on Sales","l10n_et_input_tax",""
-"l10n_et2250","2250","Prepayments","l10n_et_view",""
-"l10n_et2251","2251","Advance to contractors","l10n_et_current_assets",""
-"l10n_et2252","2252","Advance to consultant","l10n_et_current_assets",""
-"l10n_et2253","2253","Advance to supplier","l10n_et_current_assets",""
-"l10n_et2274","2254","Other Debtors","l10n_et_current_assets",""
-"l10n_et2301","2301","Goods in Transit","l10n_et_current_assets",""
-"l10n_et2351","2351","Stock","l10n_et_current_assets",""
-"l10n_et2400","2400-2499","Production Stock","l10n_et_view",""
-"l10n_et2411","2411","Work in Progress","l10n_et_current_assets",""
-"l10n_et2412","2412","Finished Goods","l10n_et_current_assets",""
-"l10n_et2500","2500","Fixed Assets","l10n_et_view",""
-"l10n_et250019","2501-2519","Construction in Progress","l10n_et_view",""
-"l10n_et2501","2501","Construction of buildings","l10n_et_asset",""
-"l10n_et2503","2503","Construction of infrastructure","l10n_et_asset",""
-"l10n_et2520","2520-2599","Property and Equipment","l10n_et_view",""
-"l10n_et2521","2521","Vehicles and other vehicular transport","l10n_et_asset",""
-"l10n_et2522","2522","Aircraft, etc","l10n_et_asset","l10n_et2520",""
-"l10n_et2523","2523","Plant machinery and equipment","l10n_et_asset",""
-"l10n_et2525","2525","Buildings","l10n_et_asset",""
-"l10n_et2527","2527","Infrastructure","l10n_et_asset",""
-"l10n_et2529","2529","Furnishings and fixtures","l10n_et_asset",""
-"l10n_et2530","2530","Livestock and tansport animals","l10n_et_asset",""
-"l10n_et2700","2700","Long Term Loans","l10n_et_view",""
-"l10n_et2800","2800","Investments","l10n_et_view",""
-"l10n_et3000","3000","LIABILITIES","l10n_et_view",""
-"l10n_et300099","3000-3099","Payables","l10n_et_view",""
-"l10n_et300019","3000-3019","Accounts Payable","l10n_et_view",""
-"l10n_et3001","3001","Grace period payables","l10n_et_payable",""
-"l10n_et3002","3002","Trade Creditors","l10n_et_payable","True"
-"l10n_et3003","3003","Pension contribution payable","l10n_et_payable",""
-"l10n_et3004","3004","Salary payable","l10n_et_payable",""
-"l10n_et3006","3006","Witholding Payable","l10n_et_output_tax",""
-"l10n_et3007","3007","VAT Payable","l10n_et_output_tax",""
-"l10n_et3008","3008","Federal Income Tax","l10n_et_output_tax",""
-"l10n_et3050","3050","Deposits","l10n_et_view",""
-"l10n_et3054","3054","Other deposits","l10n_et_current_liabilities",""
-"l10n_et3060","3060","Retentions","l10n_et_view",""
-"l10n_et3061","3061","Retention on contract","l10n_et_current_liabilities",""
-"l10n_et3100","3100","Long-Term Debt","l10n_et_view",""
-"l10n_et310049","3100-3149","Local Loans","l10n_et_view",""
-"l10n_et3103","3103","Commercial Loan","l10n_et_liability",""
-"l10n_et3150","3150-3179","Foreign Loans","l10n_et_view",""
-"l10n_et3153","3153","Commercial Loan","l10n_et_liability",""
-"l10n_et4000","4000","NET ASSETS/EQUITY","l10n_et_view",""
-"l10n_et4001","4010","Share capital / equity","l10n_et_equity",""
-"l10n_et4004","4020","Reserves","l10n_et_equity",""
-"l10n_et4100","4100","Profit and loss account","l10n_et_profit_and_loss",""
-"l10n_et5000","5000","COST OF GOODS SOLD","l10n_et_view",""
-"l10n_et5111","5111","Cost of Goods and Services","l10n_et_expense",""
-"l10n_et5901","5901","Inventory Adjustments","l10n_et_expense",""
-"l10n_et5911","5911","Purchase Returns and Allowances","l10n_et_expense",""
-"l10n_et5921","5921","Other","l10n_et_expense",""
-"l10n_et6000","6000","EXPENSES","l10n_et_view",""
-"l10n_et6100","6100","PERSONNEL SERVICES","l10n_et_view",""
-"l10n_et6110","6110","Compensation","l10n_et_view",""
-"l10n_et6111","6111","Salaries to permanent staff","l10n_et_expense",""
-"l10n_et6113","6113","Wages to contract staff","l10n_et_expense",""
-"l10n_et6114","6114","Wages to casual staff","l10n_et_expense",""
-"l10n_et6115","6115","Wages to external contract staff","l10n_et_expense",""
-"l10n_et6116","6116","Miscellaneous payments to staff","l10n_et_expense",""
-"l10n_et6120","6120","Allowances/benefits","l10n_et_view",""
-"l10n_et6121","6121","Allowances to permanent staff","l10n_et_expense",""
-"l10n_et6123","6123","Allowances to contract staff","l10n_et_expense",""
-"l10n_et6124","6124","Allowances to external contract staff","l10n_et_expense",""
-"l10n_et6130","6130","Pension Contributions","l10n_et_view",""
-"l10n_et6131","6131","Contribution to permanent staff pensions","l10n_et_expense",""
-"l10n_et6200","6200","GOODS AND SERVICES","l10n_et_view",""
-"l10n_et6210","6210-20","Goods and Supplies","l10n_et_view",""
-"l10n_et6211","6211","Uniforms, bedding","l10n_et_expense","l10n_et6210",""
-"l10n_et6212","6212","Office supplies","l10n_et_expense",""
-"l10n_et6213","6213","Printing","l10n_et_expense",""
-"l10n_et6214","6214","Medical supplies","l10n_et_expense",""
-"l10n_et6215","6215","Educational supplies","l10n_et_expense",""
-"l10n_et6216","6216","Food","l10n_et_expense",""
-"l10n_et6217","6217","Fuel and lubricants","l10n_et_expense",""
-"l10n_et6218","6218","Other material and supplies","l10n_et_expense",""
-"l10n_et6219","6219","Miscellaneous equipment","l10n_et_expense",""
-"l10n_et6221","6221","Agriculture, forestry and marine inputs","l10n_et_expense",""
-"l10n_et6222","6222","Veterinary supplies and drugs","l10n_et_expense",""
-"l10n_et6223","6223","Research and development supplies","l10n_et_expense",""
-"l10n_et6230","6230","Travelling and Official Entertainment Services","l10n_et_view",""
-"l10n_et6231","6231","Per diem","l10n_et_expense",""
-"l10n_et6232","6232","Transport fees","l10n_et_expense",""
-"l10n_et6233","6233","Official entertainment","l10n_et_expense",""
-"l10n_et6240","6240","Maintenance and Repair Services","l10n_et_view",""
-"l10n_et6241","6241","Maintenance and repair of vehicles and other transport","l10n_et_expense",""
-"l10n_et6243","6243","Maintenance and repair of plant, and equipment","l10n_et_expense","l10n_et6240",""
-"l10n_et6244","6244","Maintenance and repair of buildings, furnishings and fixtures","l10n_et_expense",""
-"l10n_et6245","6245","Maintenance and repair of infrastructure","l10n_et_expense",""
-"l10n_et6250","6250","Contracted Services","l10n_et_view",""
-"l10n_et6251","6251","Contracted professional services","l10n_et_expense",""
-"l10n_et6252","6252","Rent","l10n_et_expense",""
-"l10n_et6253","6253","Advertising","l10n_et_expense",""
-"l10n_et6254","6254","Insurance","l10n_et_expense",""
-"l10n_et6255","6255","Freight","l10n_et_expense",""
-"l10n_et6256","6256","Fees and charges","l10n_et_expense",""
-"l10n_et6257","6257","Electricity charges","l10n_et_expense",""
-"l10n_et6258","6258","Telecommunication charges","l10n_et_expense",""
-"l10n_et6259","6259","Water and other utilities","l10n_et_expense",""
-"l10n_et6270","6270","Training Services","l10n_et_view",""
-"l10n_et6271","6271","Local training","l10n_et_expense",""
-"l10n_et6272","6272","External training","l10n_et_expense",""
-"l10n_et6300","6300","FIXED ASSETS AND CONSTRUCTION","l10n_et_view",""
-"l10n_et6310","6310","Fixed Assets","l10n_et_view",""
-"l10n_et6311","6311","Depreciation of vehicles and other vehicular transport","l10n_et_expense",""
-"l10n_et6313","6313","Depreciation of plant, machinery and equipment","l10n_et_expense",""
-"l10n_et6314","6314","Depreciation of buildings, furnishings and fixtures","l10n_et_expense",""
-"l10n_et6315","6315","Depreciation of livestock and transport animals","l10n_et_expense",""
-"l10n_et6320","6320","Construction","l10n_et_view",""
-"l10n_et6321","6321","Pre-construction activities","l10n_et_expense",""
-"l10n_et6322","6322","Construction of buildings","l10n_et_expense",""
-"l10n_et6324","6324","Construction of infrastructure","l10n_et_expense",""
-"l10n_et6400","6400","OTHER PAYMENTS","l10n_et_view",""
-"l10n_et6430","6430","Debt Payments","l10n_et_view",""
-"l10n_et6431","6431","Payments on the principal of foreign debt","l10n_et_expense",""
-"l10n_et6432","6432","Payments of interest and bank charges on foreign debt","l10n_et_expense",""
-"l10n_et6433","6433","Payments on the principal of local debt","l10n_et_expense",""
-"l10n_et6434","6434","Payments of interest and bank charges on local debt","l10n_et_expense",""
+"id","code","name","user_type_id:id","reconcile","chart_template_id:id"
+"l10n_et1100","1100","Sales of Goods and Services","account.data_account_type_revenue","",l10n_et.l10n_et
+"l10n_et2102","2102","Cash at bank in foreigh currency","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et2104","2104","Letter of Credit restricted account","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et2201","2201","Suspense","account.data_account_type_receivable","True",l10n_et.l10n_et
+"l10n_et2202","2202","Cash shortage","account.data_account_type_receivable","True",l10n_et.l10n_et
+"l10n_et2203","2203","Advance to staff","account.data_account_type_receivable","True",l10n_et.l10n_et
+"l10n_et2204","2204","Cash Registers","account.data_account_type_receivable","True",l10n_et.l10n_et
+"l10n_et2211","2211","Trade Debtors","account.data_account_type_receivable","True",l10n_et.l10n_et
+"l10n_et2212","2212","VAT Receivable on Purchases","account.data_account_type_current_liabilities","",l10n_et.l10n_et
+"l10n_et2213","2213","Withholding Receivable on Sales","account.data_account_type_current_liabilities","",l10n_et.l10n_et
+"l10n_et2214","2214","VAT Withholding Receivable on Sales","account.data_account_type_current_liabilities","",l10n_et.l10n_et
+"l10n_et2251","2251","Advance to contractors","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et2252","2252","Advance to consultant","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et2253","2253","Advance to supplier","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et2274","2254","Other Debtors","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et2301","2301","Goods in Transit","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et2351","2351","Stock","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et2411","2411","Work in Progress","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et2412","2412","Finished Goods","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et2501","2501","Construction of buildings","account.data_account_type_fixed_assets","",l10n_et.l10n_et
+"l10n_et2503","2503","Construction of infrastructure","account.data_account_type_fixed_assets","",l10n_et.l10n_et
+"l10n_et2521","2521","Vehicles and other vehicular transport","account.data_account_type_fixed_assets","",l10n_et.l10n_et
+"l10n_et2522","2522","Aircraft, etc","account.data_account_type_fixed_assets","l10n_et2520","",l10n_et.l10n_et
+"l10n_et2523","2523","Plant machinery and equipment","account.data_account_type_fixed_assets","",l10n_et.l10n_et
+"l10n_et2525","2525","Buildings","account.data_account_type_fixed_assets","",l10n_et.l10n_et
+"l10n_et2527","2527","Infrastructure","account.data_account_type_fixed_assets","",l10n_et.l10n_et
+"l10n_et2529","2529","Furnishings and fixtures","account.data_account_type_fixed_assets","",l10n_et.l10n_et
+"l10n_et2530","2530","Livestock and tansport animals","account.data_account_type_fixed_assets","",l10n_et.l10n_et
+"l10n_et3001","3001","Grace period payables","account.data_account_type_payable","True",l10n_et.l10n_et
+"l10n_et3002","3002","Trade Creditors","account.data_account_type_payable","True",l10n_et.l10n_et
+"l10n_et3003","3003","Pension contribution payable","account.data_account_type_payable","True",l10n_et.l10n_et
+"l10n_et3004","3004","Salary payable","account.data_account_type_payable","True",l10n_et.l10n_et
+"l10n_et3006","3006","Witholding Payable","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et3007","3007","VAT Payable","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et3008","3008","Federal Income Tax","account.data_account_type_current_assets","",l10n_et.l10n_et
+"l10n_et3054","3054","Other deposits","account.data_account_type_current_liabilities","",l10n_et.l10n_et
+"l10n_et3061","3061","Retention on contract","account.data_account_type_current_liabilities","",l10n_et.l10n_et
+"l10n_et3103","3103","Commercial Loan","account.data_account_type_current_liabilities","",l10n_et.l10n_et
+"l10n_et3153","3153","Commercial Loan","account.data_account_type_current_liabilities","",l10n_et.l10n_et
+"l10n_et4001","4010","Share capital / equity","account.data_account_type_equity","",l10n_et.l10n_et
+"l10n_et4004","4020","Reserves","account.data_account_type_equity","",l10n_et.l10n_et
+"l10n_et5111","5111","Cost of Goods and Services","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et5901","5901","Inventory Adjustments","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et5911","5911","Purchase Returns and Allowances","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et5921","5921","Other","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6111","6111","Salaries to permanent staff","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6113","6113","Wages to contract staff","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6114","6114","Wages to casual staff","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6115","6115","Wages to external contract staff","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6116","6116","Miscellaneous payments to staff","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6121","6121","Allowances to permanent staff","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6123","6123","Allowances to contract staff","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6124","6124","Allowances to external contract staff","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6131","6131","Contribution to permanent staff pensions","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6211","6211","Uniforms, bedding","account.data_account_type_expenses","l10n_et6210","",l10n_et.l10n_et
+"l10n_et6212","6212","Office supplies","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6213","6213","Printing","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6214","6214","Medical supplies","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6215","6215","Educational supplies","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6216","6216","Food","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6217","6217","Fuel and lubricants","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6218","6218","Other material and supplies","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6219","6219","Miscellaneous equipment","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6221","6221","Agriculture, forestry and marine inputs","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6222","6222","Veterinary supplies and drugs","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6223","6223","Research and development supplies","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6231","6231","Per diem","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6232","6232","Transport fees","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6233","6233","Official entertainment","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6241","6241","Maintenance and repair of vehicles and other transport","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6243","6243","Maintenance and repair of plant, and equipment","account.data_account_type_expenses","l10n_et6240","",l10n_et.l10n_et
+"l10n_et6244","6244","Maintenance and repair of buildings, furnishings and fixtures","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6245","6245","Maintenance and repair of infrastructure","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6251","6251","Contracted professional services","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6252","6252","Rent","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6253","6253","Advertising","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6254","6254","Insurance","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6255","6255","Freight","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6256","6256","Fees and charges","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6257","6257","Electricity charges","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6258","6258","Telecommunication charges","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6259","6259","Water and other utilities","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6271","6271","Local training","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6272","6272","External training","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6311","6311","Depreciation of vehicles and other vehicular transport","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6313","6313","Depreciation of plant, machinery and equipment","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6314","6314","Depreciation of buildings, furnishings and fixtures","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6315","6315","Depreciation of livestock and transport animals","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6321","6321","Pre-construction activities","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6322","6322","Construction of buildings","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6324","6324","Construction of infrastructure","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6431","6431","Payments on the principal of foreign debt","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6432","6432","Payments of interest and bank charges on foreign debt","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6433","6433","Payments on the principal of local debt","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6434","6434","Payments of interest and bank charges on local debt","account.data_account_type_expenses","",l10n_et.l10n_et
+"l10n_et6435","1200","Foreign Exchange Currency Gain Account","account.data_account_type_other_income","",l10n_et.l10n_et
+"l10n_et6436","6260","Foreign Exchange Currency Loss Account","account.data_account_type_expenses","",l10n_et.l10n_et
diff --git a/addons/l10n_et/data/account.account.type.csv b/addons/l10n_et/data/account.account.type.csv
deleted file mode 100644
index a98b63a8494..00000000000
--- a/addons/l10n_et/data/account.account.type.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-"id","name","close_method","report_type"
-"l10n_et_asset","Fixed Assets","Balance","asset"
-"l10n_et_current_assets","Current Assets","Balance","asset"
-"l10n_et_equity","Equity","Balance","liability"
-"l10n_et_expense","Expense","None","expense"
-"l10n_et_income","Income","None","income"
-"l10n_et_liability","Long-Term Liabilities","Balance","liability"
-"l10n_et_current_liabilities","Current Liabilities","Balance","liability"
-"l10n_et_payable","Payable","none","liability"
-"l10n_et_receivable","Receivable","none","asset"
-"l10n_et_output_tax","Output Tax","none","liability"
-"l10n_et_input_tax","Input Tax","none","asset"
-"l10n_et_profit_and_loss","Profit and Loss","None","none"
-"l10n_et_view","View","None","/"
diff --git a/addons/l10n_et/data/account.chart.template.csv b/addons/l10n_et/data/account.chart.template.csv
deleted file mode 100644
index ec85ea9eb6b..00000000000
--- a/addons/l10n_et/data/account.chart.template.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"id","name","account_root_id:id","tax_code_root_id:id","bank_account_view_id:id","property_account_receivable:id","property_account_payable:id","property_account_expense_categ:id","property_account_income_categ:id","currency_id:id"
-"l10n_et","Ethiopia Tax and Account Chart Template","l10n_et0","tc_01","l10n_et2110","l10n_et2211","l10n_et3002","l10n_et2301","l10n_et1100","base.ETB"
diff --git a/addons/l10n_et/data/account.tax.template.csv b/addons/l10n_et/data/account.tax.template.csv
index 71cb2a10c38..19281193cdb 100644
--- a/addons/l10n_et/data/account.tax.template.csv
+++ b/addons/l10n_et/data/account.tax.template.csv
@@ -1,14 +1,14 @@
-id,description,chart_template_id:id,type_tax_use,name,amount,amount_type
-id_tax03,,l10n_et,sale,VAT 15% rated sales,0.15,percent
-id_tax04,,l10n_et,sale,VAT 0% rated sales,,percent
-id_tax06,,l10n_et,sale,VAT Exempt rated sales,,percent
-id_tax11,,l10n_et,sale,VAT Out of Scope rated sales,,percent
-id_tax02,,l10n_et,sale,Withholding 2% rated sales,-0.02,percent
-id_tax13,,l10n_et,sale,Withholding 35% rated sales,-0.35,percent
-id_tax14,,l10n_et,sale,Withholding VAT 15% rated sales,-0.15,percent
-id_tax08,,l10n_et,purchase,VAT 15% rated purchases,0.15,percent
-id_tax07,,l10n_et,purchase,VAT 0% rated purchases,,percent
-id_tax10,,l10n_et,purchase,VAT Exempt rated purchases,,percent
-id_tax09,,l10n_et,purchase,VAT Out of Scope rated purchases,,percent
-id_tax05,,l10n_et,purchase,Withholding 2% rated purchases,-0.02,percent
-id_tax12,,l10n_et,purchase,Withholding 35% rated purchases,-0.35,percent
+id,description,chart_template_id:id,type_tax_use,name,amount,amount_type,tag_ids:id,account_id:id,refund_account_id:id
+id_tax03,tax03,l10n_et,sale,VAT 15% rated sales,15,percent,tax_tax03,l10n_et3007,l10n_et3007
+id_tax04,tax04,l10n_et,sale,VAT 0% rated sales,,percent,tax_tax04,l10n_et3007,l10n_et3007
+id_tax06,tax06,l10n_et,sale,VAT Exempt rated sales,,percent,tax_tax06,l10n_et3007,l10n_et3007
+id_tax11,tax11,l10n_et,sale,VAT Out of Scope rated sales,,percent,tax_tax11,l10n_et3007,l10n_et3007
+id_tax02,tax02,l10n_et,sale,Withholding 2% rated sales,-2,percent,tax_tax02,l10n_et3006,l10n_et3006
+id_tax13,tax13,l10n_et,sale,Withholding 35% rated sales,-35,percent,tax_tax13,l10n_et3006,l10n_et3006
+id_tax14,tax14,l10n_et,sale,Withholding VAT 15% rated sales,-15,percent,tax_tax14,l10n_et3006,l10n_et3006
+id_tax08,tax08,l10n_et,purchase,VAT 15% rated purchases,15,percent,tax_tax08,l10n_et2212,l10n_et2212
+id_tax07,tax07,l10n_et,purchase,VAT 0% rated purchases,,percent,tax_tax07,l10n_et2212,l10n_et2212
+id_tax10,tax10,l10n_et,purchase,VAT Exempt rated purchases,,percent,tax_tax10,l10n_et2212,l10n_et2212
+id_tax09,tax09,l10n_et,purchase,VAT Out of Scope rated purchases,,percent,tax_tax09,l10n_et2212,l10n_et2212
+id_tax05,tax05,l10n_et,purchase,Withholding 2% rated purchases,-2,percent,tax_tax05,l10n_et2213,l10n_et2213
+id_tax12,tax12,l10n_et,purchase,Withholding 35% rated purchases,-35,percent,tax_tax12,l10n_et2213,l10n_et2213
diff --git a/addons/l10n_et/data/account_account_tag.xml b/addons/l10n_et/data/account_account_tag.xml
new file mode 100644
index 00000000000..13c9856c815
--- /dev/null
+++ b/addons/l10n_et/data/account_account_tag.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Account Tags -->
+
+        <record id="tax_tax03" model="account.account.tag">
+            <field name="name">tax03</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tax04" model="account.account.tag">
+            <field name="name">tax04</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tax06" model="account.account.tag">
+            <field name="name">tax06</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tax11" model="account.account.tag">
+            <field name="name">tax11</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tax02" model="account.account.tag">
+            <field name="name">tax02</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tax13" model="account.account.tag">
+            <field name="name">tax13</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tax14" model="account.account.tag">
+            <field name="name">tax14</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tax08" model="account.account.tag">
+            <field name="name">tax08</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tax07" model="account.account.tag">
+            <field name="name">tax07</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tax10" model="account.account.tag">
+            <field name="name">tax10</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tax09" model="account.account.tag">
+            <field name="name">tax09</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tax05" model="account.account.tag">
+            <field name="name">tax05</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+        <record id="tax_tax12" model="account.account.tag">
+            <field name="name">tax12</field>
+            <field name="applicability">taxes</field>
+        </record>
+
+</odoo>
diff --git a/addons/l10n_et/data/account_chart_template.xml b/addons/l10n_et/data/account_chart_template.xml
new file mode 100644
index 00000000000..b232b0ab896
--- /dev/null
+++ b/addons/l10n_et/data/account_chart_template.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="account.account.template" id="transfer_account_id">
+        <field name="name">Transfer account</field>
+        <field name="code">212</field>
+        <field name="user_type_id" ref="account.data_account_type_current_assets" />
+        <field name="reconcile" eval="True" />
+    </record>
+
+    <record id="l10n_et" model="account.chart.template">
+        <field name="name">Ethiopia Tax and Account Chart Template</field>
+        <field name="code_digits">6</field>
+        <field name="currency_id" ref="base.ETB"/>
+        <field name="bank_account_code_prefix">211</field>
+        <field name="cash_account_code_prefix">211</field>
+        <field name="transfer_account_id" ref="transfer_account_id"/>
+    </record>
+
+    <record model="account.account.template" id="transfer_account_id">
+        <field name="chart_template_id" ref="l10n_et"/>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/addons/l10n_et/data/account_chart_template.yml b/addons/l10n_et/data/account_chart_template.yml
new file mode 100644
index 00000000000..6c49d6e9165
--- /dev/null
+++ b/addons/l10n_et/data/account_chart_template.yml
@@ -0,0 +1,3 @@
+-
+  !python {model: account.chart.template, id: l10n_et}: |
+    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_et/data/set_account_on_chart_template.xml b/addons/l10n_et/data/set_account_on_chart_template.xml
new file mode 100644
index 00000000000..de564c6bfe1
--- /dev/null
+++ b/addons/l10n_et/data/set_account_on_chart_template.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="l10n_et" model="account.chart.template">
+        <field name="property_account_receivable_id" ref="l10n_et2211"/>
+        <field name="property_account_payable_id" ref="l10n_et3002"/>
+        <field name="property_account_expense_categ_id" ref="l10n_et2301"/>
+        <field name="property_account_income_categ_id" ref="l10n_et1100"/>
+        <field name="income_currency_exchange_account_id" ref="l10n_et6435"/>
+        <field name="expense_currency_exchange_account_id" ref="l10n_et6436"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/addons/l10n_et/l10n_et_wizard.xml b/addons/l10n_et/l10n_et_wizard.xml
deleted file mode 100644
index cbbb56b7989..00000000000
--- a/addons/l10n_et/l10n_et_wizard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data noupdate="1">
-        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
-            <field name="state">open</field>
-        </record>
-    </data>
-</openerp>