diff --git a/sql/Estonian-KA2-chart.sql b/sql/Estonian-KA2-chart.sql
deleted file mode 100644
index 504249c27..000000000
--- a/sql/Estonian-KA2-chart.sql
+++ /dev/null
@@ -1,80 +0,0 @@
--- Default chart of accounts
--- sample only
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('11','Raha','H','','A','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1101','Kassa','A','','A','AR_paid:AP_paid');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1102','Pangakonto','A','','A','AR_paid:AP_paid');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('13','Nõuded ja ettemaksed','H','','A','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1310','Nõuded ostjate vastu','A','','A','AR');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1320','Sisendkäibemaks (18%)','A','','L','AP_tax:IC_taxpart:IC_taxservice');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1330','Arveldused aruandvate isikutega','A','','A','AP_paid');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('14','Varud','H','','A','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1410','Tooraine ja materjal','A','','A','AP_amount');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1430','Valmistoodang','A','','A','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1440','Müügiks ostetud kaubad','A','','A','IC');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('17','Materiaalne põhivara','H','','A','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1730','Masinad ja seadmed','A','','A','AP_amount');
-insert into chart (accno,description,charttype,gifi_accno,category,link,contra) values ('1731','Masinate ja seadmete kulum','A','','A','','1');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1740','Muu materiaalne põhivara ','A','','A','AP_amount');
-insert into chart (accno,description,charttype,gifi_accno,category,link,contra) values ('1741','Muu materiaalse põhivara kulum','A','','A','','1');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2110','Lühiajalised laenud','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('21','Laenukohustused','H','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('22','Võlad ja ettemaksed','H','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2210','Võlad tarnijatele','A','','L','AP');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2220','Võlad töövõtjatele','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('223','Maksuvõlad','H','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2230','Arvestatud käibemaks (18%)','A','','L','AR_tax:IC_taxpart:IC_taxservice');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2231','Ettevõtte tulumaks','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2232','Kinnipeetud tulumaks','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2233','sotsiaalmaks','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2234','Töötuskindlustusmaksed','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2235','Kogumispension','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2240','Arveldused aruandvate isikutega','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2241','Muud võlad','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('24','Pikaajalised laenukohustused','H','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2410','Pikaajalised laenud','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('27','OMAKAPITAL','H','','Q','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2710','Osakapital nimiväärtuses','A','','Q','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2760','Eelmiste perioodide jaotamata kasum','A','','Q','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('31','Müügitulud','H','','I','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3101','Tulud kaupade müügist','A','','I','AR_amount:IC_sale');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3102','Tulud teenuste müügist','A','','I','AR_amount:IC_income');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('35','Muud äritulud','H','','I','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3501','Kasum valuutakursi muutustest','A','','I','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('37','Finanstulud','H','','I','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3701','Intressitulud','A','','I','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('40','Tootmiskulud','H','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4001','Materjalikulu','A','','E','AP_amount:IC_expense');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4002','Palgakulud','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4003','Sotsiaalmaksu kulu','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4004','Tööandja töötuskindlustusmakse kulu','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('42','Müüdud toodangu (kaupade, teenuste) kulud','H','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4201','Müüdud kaupade kulu','A','','E','AP_amount:IC_cogs');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4202','Müüdud teenuste kulu','A','','E','AP_amount:IC_expense');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('43','Turustuskulud','H','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4301','Reklaamikulud','A','','E','AP_amount:IC_expense');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('44','Üldhalduskulud','H','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4401','Panga teenustasud','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4402','Sõiduvahendite kütusekulu','A','','E','AP_amount:IC_expense');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4403','Sõiduvahendite muud kulud','A','','E','AP_amount:IC_expense');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4404','Palgakulud','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4405','Sotsiaalmaksu kulu','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('46','Muud ärikulud','H','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4601','Kahjum valuutakursi muutustest','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('48','Finantskulud','H','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4801','Intressikulud','A','','E','');
---
-insert into tax (chart_id,rate) values ((select id from chart where accno = '1320'),0.18);
-insert into tax (chart_id,rate) values ((select id from chart where accno = '2230'),0.18);
---
-insert into defaults (fldname, fldvalue) values ('inventory_accno_id', (select id from chart where accno = '1440'));
-insert into defaults (fldname, fldvalue) values ('income_accno_id', (select id from chart where accno = '3101'));
-insert into defaults (fldname, fldvalue) values ('expense_accno_id', (select id from chart where accno = '4201'));
-insert into defaults (fldname, fldvalue) values ('fxgain_accno_id', (select id from chart where accno = '3501'));
-insert into defaults (fldname, fldvalue) values ('fxloss_accno_id', (select id from chart where accno = '4601'));
-insert into defaults (fldname, fldvalue) values ('weightunit', 'kg');
-INSERT INTO defaults (fldname, fldvalue) VALUES ('precision', '2');
---
-INSERT INTO curr (rn, curr, prec) VALUES (1,'EEK',2);
-INSERT INTO curr (rn, curr, prec) VALUES (2,'EUR',2);
-INSERT INTO curr (rn, curr, prec) VALUES (3,'USD',2);
---
diff --git a/sql/Estonian-UTF8-chart.sql b/sql/Estonian-UTF8-chart.sql
index b683c5801..c1b5fa94e 100644
--- a/sql/Estonian-UTF8-chart.sql
+++ b/sql/Estonian-UTF8-chart.sql
@@ -5,7 +5,7 @@ insert into chart (accno,description,charttype,gifi_accno,category,link) values
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1102','Pangakonto','A','','A','AR_paid:AP_paid');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('13','NƵuded ja ettemaksed','H','','A','');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1310','NƵuded ostjate vastu','A','','A','AR');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1320','SisendkƤibemaks (18%)','A','','L','AP_tax:IC_taxpart:IC_taxservice');
+insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1320','SisendkƤibemaks (20%)','A','','L','AP_tax:IC_taxpart:IC_taxservice');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1330','Arveldused aruandvate isikutega','A','','A','AP_paid');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('14','Varud','H','','A','');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1410','Tooraine ja materjal','A','','A','AP_amount');
@@ -22,7 +22,7 @@ insert into chart (accno,description,charttype,gifi_accno,category,link) values
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2210','VƵlad tarnijatele','A','','L','AP');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2220','VƵlad tƶƶvƵtjatele','A','','L','');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('223','MaksuvƵlad','H','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2230','Arvestatud kƤibemaks (18%)','A','','L','AR_tax:IC_taxpart:IC_taxservice');
+insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2230','Arvestatud kƤibemaks (20%)','A','','L','AR_tax:IC_taxpart:IC_taxservice');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2231','EttevƵtte tulumaks','A','','L','');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2232','Kinnipeetud tulumaks','A','','L','');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2233','sotsiaalmaks','A','','L','');
@@ -63,8 +63,8 @@ insert into chart (accno,description,charttype,gifi_accno,category,link) values
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('48','Finantskulud','H','','E','');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4801','Intressikulud','A','','E','');
 --
-insert into tax (chart_id,rate) values ((select id from chart where accno = '1320'),0.18);
-insert into tax (chart_id,rate) values ((select id from chart where accno = '2230'),0.18);
+insert into tax (chart_id,rate) values ((select id from chart where accno = '1320'),0.20);
+insert into tax (chart_id,rate) values ((select id from chart where accno = '2230'),0.20);
 --
 insert into defaults (fldname, fldvalue) values ('inventory_accno_id', (select id from chart where accno = '1440'));
 insert into defaults (fldname, fldvalue) values ('income_accno_id', (select id from chart where accno = '3101'));
diff --git a/sql/Estonian_KA2-chart.sql b/sql/Estonian_KA2-chart.sql
deleted file mode 100644
index 4ae67d707..000000000
--- a/sql/Estonian_KA2-chart.sql
+++ /dev/null
@@ -1,83 +0,0 @@
--- Default chart of accounts
--- sample only
---
-SET client_encoding = 'ISO-8859-13';
---
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('11','Raha','H','','A','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1101','Kassa','A','','A','AR_paid:AP_paid');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1102','Pangakonto','A','','A','AR_paid:AP_paid');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('13','Nõuded ja ettemaksed','H','','A','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1310','Nõuded ostjate vastu','A','','A','AR');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1320','Sisendkäibemaks (18%)','A','','L','AP_tax:IC_taxpart:IC_taxservice');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1330','Arveldused aruandvate isikutega','A','','A','AP_paid');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('14','Varud','H','','A','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1410','Tooraine ja materjal','A','','A','AP_amount');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1430','Valmistoodang','A','','A','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1440','Müügiks ostetud kaubad','A','','A','IC');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('17','Materiaalne põhivara','H','','A','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1730','Masinad ja seadmed','A','','A','AP_amount');
-insert into chart (accno,description,charttype,gifi_accno,category,link,contra) values ('1731','Masinate ja seadmete kulum','A','','A','','1');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('1740','Muu materiaalne põhivara ','A','','A','AP_amount');
-insert into chart (accno,description,charttype,gifi_accno,category,link,contra) values ('1741','Muu materiaalse põhivara kulum','A','','A','','1');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2110','Lühiajalised laenud','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('21','Laenukohustused','H','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('22','Võlad ja ettemaksed','H','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2210','Võlad tarnijatele','A','','L','AP');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2220','Võlad töövõtjatele','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('223','Maksuvõlad','H','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2230','Arvestatud käibemaks (18%)','A','','L','AR_tax:IC_taxpart:IC_taxservice');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2231','Ettevõtte tulumaks','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2232','Kinnipeetud tulumaks','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2233','sotsiaalmaks','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2234','Töötuskindlustusmaksed','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2235','Kogumispension','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2240','Arveldused aruandvate isikutega','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2241','Muud võlad','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('24','Pikaajalised laenukohustused','H','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2410','Pikaajalised laenud','A','','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('27','OMAKAPITAL','H','','Q','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2710','Osakapital nimiväärtuses','A','','Q','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('2760','Eelmiste perioodide jaotamata kasum','A','','Q','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('31','Müügitulud','H','','I','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3101','Tulud kaupade müügist','A','','I','AR_amount:IC_sale');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3102','Tulud teenuste müügist','A','','I','AR_amount:IC_income');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('35','Muud äritulud','H','','I','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3501','Kasum valuutakursi muutustest','A','','I','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('37','Finanstulud','H','','I','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3701','Intressitulud','A','','I','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('40','Tootmiskulud','H','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4001','Materjalikulu','A','','E','AP_amount:IC_expense');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4002','Palgakulud','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4003','Sotsiaalmaksu kulu','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4004','Tööandja töötuskindlustusmakse kulu','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('42','Müüdud toodangu (kaupade, teenuste) kulud','H','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4201','Müüdud kaupade kulu','A','','E','AP_amount:IC_cogs');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4202','Müüdud teenuste kulu','A','','E','AP_amount:IC_expense');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('43','Turustuskulud','H','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4301','Reklaamikulud','A','','E','AP_amount:IC_expense');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('44','Üldhalduskulud','H','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4401','Panga teenustasud','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4402','Sõiduvahendite kütusekulu','A','','E','AP_amount:IC_expense');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4403','Sõiduvahendite muud kulud','A','','E','AP_amount:IC_expense');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4404','Palgakulud','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4405','Sotsiaalmaksu kulu','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('46','Muud ärikulud','H','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4601','Kahjum valuutakursi muutustest','A','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('48','Finantskulud','H','','E','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4801','Intressikulud','A','','E','');
---
-insert into tax (chart_id,rate) values ((select id from chart where accno = '1320'),0.18);
-insert into tax (chart_id,rate) values ((select id from chart where accno = '2230'),0.18);
---
-insert into defaults (fldname, fldvalue) values ('inventory_accno_id', (select id from chart where accno = '1440'));
-insert into defaults (fldname, fldvalue) values ('income_accno_id', (select id from chart where accno = '3101'));
-insert into defaults (fldname, fldvalue) values ('expense_accno_id', (select id from chart where accno = '4201'));
-insert into defaults (fldname, fldvalue) values ('fxgain_accno_id', (select id from chart where accno = '3501'));
-insert into defaults (fldname, fldvalue) values ('fxloss_accno_id', (select id from chart where accno = '4601'));
-insert into defaults (fldname, fldvalue) values ('weightunit', 'kg');
-INSERT INTO defaults (fldname, fldvalue) VALUES ('precision', '2');
---
-INSERT INTO curr (rn, curr, prec) VALUES (1,'EEK',2);
-INSERT INTO curr (rn, curr, prec) VALUES (2,'EUR',2);
-INSERT INTO curr (rn, curr, prec) VALUES (3,'USD',2);
---