Fixed defaults in numerous CoA's

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@598 4979c152-3d1c-0410-bac9-87ea11338e46

39 files changed, 52 insertions, 47 deletions

diff --git a/sql/Australia_General_0000-chart.sql b/sql/Australia_General_0000-chart.sql
index f9a25262..9c2a70b9 100755
--- a/sql/Australia_General_0000-chart.sql
+++ b/sql/Australia_General_0000-chart.sql
@@ -109,9 +109,9 @@ INSERT INTO chart (accno, description, charttype, category, link, gifi_accno) VA
 INSERT INTO tax (chart_id, rate, taxnumber) VALUES ((SELECT id FROM chart WHERE accno = '1230'), 0.1, '');
 INSERT INTO tax (chart_id, rate, taxnumber) VALUES ((SELECT id FROM chart WHERE accno = '2290'), 0.1, '');
 --
- SET inventory_accno_id = (SELECT id FROM chart WHERE accno = '1520'));
+INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (SELECT id FROM chart WHERE accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (SELECT id FROM chart WHERE accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (SELECT id FROM chart WHERE accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (SELECT id FROM chart WHERE accno = '5020'));
 
diff --git a/sql/Australia_General_00000-chart.sql b/sql/Australia_General_00000-chart.sql
index 0c0a2c2b..4d15e812 100755
--- a/sql/Australia_General_00000-chart.sql
+++ b/sql/Australia_General_00000-chart.sql
@@ -76,7 +76,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '210
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '15001'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '40001'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '40001'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '50001'));
 
diff --git a/sql/Bahasa-Indonesia_Default-chart.sql b/sql/Bahasa-Indonesia_Default-chart.sql
index e4e0f431..087ebd70 100755
--- a/sql/Bahasa-Indonesia_Default-chart.sql
+++ b/sql/Bahasa-Indonesia_Default-chart.sql
@@ -71,7 +71,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '231
 --

 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5010'));
 
diff --git a/sql/Belgium-chart.sql b/sql/Belgium-chart.sql
index af472c7b..0637749b 100755
--- a/sql/Belgium-chart.sql
+++ b/sql/Belgium-chart.sql
@@ -430,9 +430,10 @@ INSERT INTO tax (chart_id, rate, taxnumber) VALUES ((SELECT id FROM chart WHERE
 INSERT INTO tax (chart_id, rate, taxnumber) VALUES ((SELECT id FROM chart WHERE accno = '451541'), 0.21);
 INSERT INTO tax (chart_id, rate, taxnumber) VALUES ((SELECT id FROM chart WHERE accno = '640700'), 0.21);
 --
- SET inventory_accno_id = (SELECT id FROM chart WHERE accno = '340'));
+INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (SELECT 
+id FROM chart WHERE accno = '340'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (SELECT id FROM chart WHERE accno = '743200'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (SELECT id FROM chart WHERE accno = '743200'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (SELECT id FROM chart WHERE accno = '604'));
 
diff --git a/sql/Brazil_General-chart.sql b/sql/Brazil_General-chart.sql
index 93a0a9f4..787a6ced 100755
--- a/sql/Brazil_General-chart.sql
+++ b/sql/Brazil_General-chart.sql
@@ -68,7 +68,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '232
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5010'));
 
diff --git a/sql/Canada-Quebec_General-UTF8-chart.sql b/sql/Canada-Quebec_General-UTF8-chart.sql
index 274f5b8d..725f0ae8 100755
--- a/sql/Canada-Quebec_General-UTF8-chart.sql
+++ b/sql/Canada-Quebec_General-UTF8-chart.sql
@@ -77,7 +77,7 @@ insert into tax (chart_id,rate,pass) values ((select id from chart where accno =
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5010'));
 
diff --git a/sql/Colombia-PUC-chart.sql b/sql/Colombia-PUC-chart.sql
index 035e249a..271de336 100755
--- a/sql/Colombia-PUC-chart.sql
+++ b/sql/Colombia-PUC-chart.sql
@@ -769,9 +769,10 @@ INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '24
 INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '2408100001'), 0.16);
 INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '2408100002'), 0.07);
 
- SET inventory_accno_id = (SELECT id FROM chart WHERE accno = '141005001'));
+ INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', 
+SELECT id FROM chart WHERE accno = '141005001'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (SELECT id FROM chart WHERE accno = '412027001'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (SELECT id FROM chart WHERE accno = '412027001'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (SELECT id FROM chart WHERE accno = '5250150001'));
 
diff --git a/sql/Colombia-utf8-PUC-chart.sql b/sql/Colombia-utf8-PUC-chart.sql
index 072207b4..469b2333 100755
--- a/sql/Colombia-utf8-PUC-chart.sql
+++ b/sql/Colombia-utf8-PUC-chart.sql
@@ -769,9 +769,10 @@ INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '24
 INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '2408100001'), 0.16);
 INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '2408100002'), 0.07);
 
- SET inventory_accno_id = (SELECT id FROM chart WHERE accno = '141005001'));
+INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', 
+(SELECT id FROM chart WHERE accno = '141005001'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (SELECT id FROM chart WHERE accno = '412027001'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (SELECT id FROM chart WHERE accno = '412027001'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (SELECT id FROM chart WHERE accno = '5250150001'));
 
diff --git a/sql/Czech-Republic-chart.sql b/sql/Czech-Republic-chart.sql
index 30d63265..dcdfffbb 100755
--- a/sql/Czech-Republic-chart.sql
+++ b/sql/Czech-Republic-chart.sql
@@ -315,7 +315,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '343
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '13200'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '60000'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '60000'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '50000'));
 
diff --git a/sql/Danish_Default-chart.sql b/sql/Danish_Default-chart.sql
index 090f40ed..61bb4791 100755
--- a/sql/Danish_Default-chart.sql
+++ b/sql/Danish_Default-chart.sql
@@ -73,7 +73,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '231
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5010'));
 
diff --git a/sql/Dutch_Default-chart.sql b/sql/Dutch_Default-chart.sql
index 3862f4c6..30f22aaa 100755
--- a/sql/Dutch_Default-chart.sql
+++ b/sql/Dutch_Default-chart.sql
@@ -78,7 +78,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '231
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5010'));
 
diff --git a/sql/Dutch_Standard-chart.sql b/sql/Dutch_Standard-chart.sql
index 79e1cac6..9ba7f7d1 100755
--- a/sql/Dutch_Standard-chart.sql
+++ b/sql/Dutch_Standard-chart.sql
@@ -231,7 +231,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '181
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '7001'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '8520'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '8520'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '8010'));
 
diff --git a/sql/Egypt-UTF8-chart.sql b/sql/Egypt-UTF8-chart.sql
index 43c20c9f..19627f40 100755
--- a/sql/Egypt-UTF8-chart.sql
+++ b/sql/Egypt-UTF8-chart.sql
@@ -72,9 +72,9 @@ INSERT INTO chart (accno,description,charttype,category,link,gifi_accno) VALUES
 INSERT INTO chart (accno,description,charttype,category,link,gifi_accno) VALUES ('5790','مرافق','A','E','AP_amount','');
 INSERT INTO chart (accno,description,charttype,category,link,gifi_accno) VALUES ('2280','ضرائب مرتبات مستحقة','A','L','','');
 
- SET inventory_accno_id = (SELECT id FROM chart WHERE accno = '1520'));
+INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (SELECT id FROM chart WHERE accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (SELECT id FROM chart WHERE accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (SELECT id FROM chart WHERE accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (SELECT id FROM chart WHERE accno = '5010'));
 
diff --git a/sql/France-chart.sql b/sql/France-chart.sql
index 47dd8f80..56d32921 100755
--- a/sql/France-chart.sql
+++ b/sql/France-chart.sql
@@ -949,7 +949,7 @@ INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '44
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '681730'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '707000'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '707000'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '601000'));
 
diff --git a/sql/German-Sample-chart.sql b/sql/German-Sample-chart.sql
index 1a157aac..97f9008f 100755
--- a/sql/German-Sample-chart.sql
+++ b/sql/German-Sample-chart.sql
@@ -214,7 +214,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '380
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1140'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '8120'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '8120'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5800'));
 
diff --git a/sql/Germany-DATEV-SKR03-chart.sql b/sql/Germany-DATEV-SKR03-chart.sql
index 0964a30b..08021da0 100755
--- a/sql/Germany-DATEV-SKR03-chart.sql
+++ b/sql/Germany-DATEV-SKR03-chart.sql
@@ -220,7 +220,7 @@ INSERT INTO chart (accno,description,charttype,category,link,gifi_accno) VALUES
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '0398000'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '0840000'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '0840000'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '0399000'));
 
diff --git a/sql/Germany-SKR03-chart.sql b/sql/Germany-SKR03-chart.sql
index ee5c4694..233ba4b4 100755
--- a/sql/Germany-SKR03-chart.sql
+++ b/sql/Germany-SKR03-chart.sql
@@ -262,7 +262,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '840
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '7140'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '8400'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '8400'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '4700'));
 
diff --git a/sql/Hungary-chart.sql b/sql/Hungary-chart.sql
index 9120937c..e4ac4a73 100755
--- a/sql/Hungary-chart.sql
+++ b/sql/Hungary-chart.sql
@@ -45,9 +45,10 @@ INSERT INTO tax (chart_id,rate,taxnumber) VALUES ((SELECT id FROM chart WHERE ac
 INSERT INTO tax (chart_id,rate,taxnumber) VALUES ((SELECT id FROM chart WHERE accno='4672'),'0.05','');
 INSERT INTO tax (chart_id,rate,taxnumber) VALUES ((SELECT id FROM chart WHERE accno='4673'),'0','');
 --
- SET inventory_accno_id = (SELECT id FROM chart WHERE accno = '2110'));
+INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', 
+(SELECT id FROM chart WHERE accno = '2110'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (SELECT id FROM chart WHERE accno = '9110'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (SELECT id FROM chart WHERE accno = '9110'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (SELECT id FROM chart WHERE accno = '8140'));
 
diff --git a/sql/Italy_General-chart.sql b/sql/Italy_General-chart.sql
index 3a10c52c..2238427f 100755
--- a/sql/Italy_General-chart.sql
+++ b/sql/Italy_General-chart.sql
@@ -177,7 +177,7 @@ INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '64
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '3020005'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '8005005'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '8005005'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '7005005'));
 
diff --git a/sql/Latvia-chart.sql b/sql/Latvia-chart.sql
index 50e8a71c..ee92a688 100755
--- a/sql/Latvia-chart.sql
+++ b/sql/Latvia-chart.sql
@@ -251,7 +251,7 @@ INSERT INTO tax (chart_id,rate,taxnumber) VALUES ((SELECT id FROM chart where ac
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1230'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '6010'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '6010'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '7110'));
 
diff --git a/sql/Norwegian_Default-chart.sql b/sql/Norwegian_Default-chart.sql
index 9da1cb0d..b4850303 100755
--- a/sql/Norwegian_Default-chart.sql
+++ b/sql/Norwegian_Default-chart.sql
@@ -295,7 +295,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '272
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1250'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '3010'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '3010'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '4010'));
 
diff --git a/sql/Paraguay-chart.sql b/sql/Paraguay-chart.sql
index db6ad0f1..67010e82 100755
--- a/sql/Paraguay-chart.sql
+++ b/sql/Paraguay-chart.sql
@@ -249,9 +249,10 @@ INSERT INTO chart (accno, description, charttype, category, link, gifi_accno) VA
 --
 INSERT INTO tax (chart_id,rate) VALUES ((select id from chart where accno = '2.151'),'0.1');
 --
- SET inventory_accno_id = (select id from chart where accno = '1.141'));
+INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', 
+(select id from chart where accno = '1.141'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4.110'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4.110'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5.110.01'));
 
diff --git a/sql/Poland-chart.sql b/sql/Poland-chart.sql
index b7793bc5..8994b0c6 100755
--- a/sql/Poland-chart.sql
+++ b/sql/Poland-chart.sql
@@ -333,7 +333,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '223
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '333000000'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '773010000'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '773010000'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '773110000'));
 
diff --git a/sql/Simplified-Chinese_Default-UTF8-chart.sql b/sql/Simplified-Chinese_Default-UTF8-chart.sql
index afeabb97..c5a094bd 100755
--- a/sql/Simplified-Chinese_Default-UTF8-chart.sql
+++ b/sql/Simplified-Chinese_Default-UTF8-chart.sql
@@ -76,7 +76,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '231
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5010'));
 
diff --git a/sql/Simplified-Chinese_Default-chart.sql b/sql/Simplified-Chinese_Default-chart.sql
index 20d41c81..4ecd9561 100755
--- a/sql/Simplified-Chinese_Default-chart.sql
+++ b/sql/Simplified-Chinese_Default-chart.sql
@@ -76,7 +76,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '231
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5010'));
 
diff --git a/sql/Spain-ISO-chart.sql b/sql/Spain-ISO-chart.sql
index ac8a20a7..47875904 100755
--- a/sql/Spain-ISO-chart.sql
+++ b/sql/Spain-ISO-chart.sql
@@ -130,7 +130,7 @@ INSERT INTO "tax" ("chart_id", "rate") VALUES ((SELECT id FROM chart WHERE accno
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '300000000'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '700000000'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '700000000'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '600000000'));
 
diff --git a/sql/Spain-UTF8-chart.sql b/sql/Spain-UTF8-chart.sql
index 9bcad317..942357a8 100755
--- a/sql/Spain-UTF8-chart.sql
+++ b/sql/Spain-UTF8-chart.sql
@@ -130,7 +130,7 @@ INSERT INTO "tax" ("chart_id", "rate") VALUES ((SELECT id FROM chart WHERE accno
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '300000000'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '700000000'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '700000000'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '600000000'));
 
diff --git a/sql/Sweden-chart.sql b/sql/Sweden-chart.sql
index d721a76d..507b15fd 100755
--- a/sql/Sweden-chart.sql
+++ b/sql/Sweden-chart.sql
@@ -1136,7 +1136,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '264
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno ='1400'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '3010'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '3010'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '4010'));
 
diff --git a/sql/Sweden_Agriculture-chart.sql b/sql/Sweden_Agriculture-chart.sql
index 2d37732d..f160ada6 100755
--- a/sql/Sweden_Agriculture-chart.sql
+++ b/sql/Sweden_Agriculture-chart.sql
@@ -1299,7 +1299,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '264
 
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno ='1400'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '3011'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '3011'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '4010'));
 
diff --git a/sql/Sweden_Church_Society-chart.sql b/sql/Sweden_Church_Society-chart.sql
index a0869104..bbef2845 100755
--- a/sql/Sweden_Church_Society-chart.sql
+++ b/sql/Sweden_Church_Society-chart.sql
@@ -229,7 +229,7 @@ insert into chart (accno,description,charttype,gifi_accno,category,link) values
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno ='1130'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '3400'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '3400'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '4400'));
 
diff --git a/sql/Swiss-German-chart.sql b/sql/Swiss-German-chart.sql
index 49761139..e46198dc 100755
--- a/sql/Swiss-German-chart.sql
+++ b/sql/Swiss-German-chart.sql
@@ -158,7 +158,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '212
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '11121'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '34002'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '34002'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '42005'));
 
diff --git a/sql/Traditional-Chinese_Default-UTF8-chart.sql b/sql/Traditional-Chinese_Default-UTF8-chart.sql
index 2ffc48d7..5e46dc79 100755
--- a/sql/Traditional-Chinese_Default-UTF8-chart.sql
+++ b/sql/Traditional-Chinese_Default-UTF8-chart.sql
@@ -76,7 +76,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '231
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5010'));
 
diff --git a/sql/Traditional-Chinese_Default-chart.sql b/sql/Traditional-Chinese_Default-chart.sql
index dc92e49d..a12aad2d 100755
--- a/sql/Traditional-Chinese_Default-chart.sql
+++ b/sql/Traditional-Chinese_Default-chart.sql
@@ -76,7 +76,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '231
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5010'));
 
diff --git a/sql/UCOA-Form990-chart.sql b/sql/UCOA-Form990-chart.sql
index 169086d9..d9b73e8f 100755
--- a/sql/UCOA-Form990-chart.sql
+++ b/sql/UCOA-Form990-chart.sql
@@ -227,7 +227,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '865
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1410'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4010'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4010'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '7510'));
 
diff --git a/sql/UCOA-Form990EZ-chart.sql b/sql/UCOA-Form990EZ-chart.sql
index 6726ee7e..db29307d 100755
--- a/sql/UCOA-Form990EZ-chart.sql
+++ b/sql/UCOA-Form990EZ-chart.sql
@@ -227,7 +227,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '865
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1410'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4010'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4010'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '7510'));
 
diff --git a/sql/UK_General-chart.sql b/sql/UK_General-chart.sql
index 131facc6..3aca9ec3 100755
--- a/sql/UK_General-chart.sql
+++ b/sql/UK_General-chart.sql
@@ -105,9 +105,9 @@ INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES
 INSERT INTO tax (chart_id,rate) VALUES ((SELECT id FROM chart WHERE accno = '2200'),0.175);
 INSERT INTO tax (chart_id,rate) VALUES ((SELECT id FROM chart WHERE accno = '2205'),0.05);
 --
- SET inventory_accno_id = (SELECT id FROM chart WHERE accno = '1001'));
+INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id',  (SELECT id FROM chart WHERE accno = '1001'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (SELECT id FROM chart WHERE accno = '4000'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (SELECT id FROM chart WHERE accno = '4000'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (SELECT id FROM chart WHERE accno = '5000'));
 
diff --git a/sql/US_Manufacturing-chart.sql b/sql/US_Manufacturing-chart.sql
index 5ad4240f..f7225843 100755
--- a/sql/US_Manufacturing-chart.sql
+++ b/sql/US_Manufacturing-chart.sql
@@ -80,7 +80,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '215
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5020'));
 
diff --git a/sql/US_Service_Company-chart.sql b/sql/US_Service_Company-chart.sql
index 96b8ca70..1318d8b5 100755
--- a/sql/US_Service_Company-chart.sql
+++ b/sql/US_Service_Company-chart.sql
@@ -66,7 +66,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '215
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4410'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4410'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5020'));
 
diff --git a/sql/Venezuela_Default-chart.sql b/sql/Venezuela_Default-chart.sql
index 7232085e..1852f5ce 100755
--- a/sql/Venezuela_Default-chart.sql
+++ b/sql/Venezuela_Default-chart.sql
@@ -86,7 +86,7 @@ insert into tax (chart_id,rate) values ((select id from chart where accno = '215
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1520'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '4020'));
+ INSERT INTO defaults (setting_key, value) VALUES ('income_accno_id', (select id from chart where accno = '4020'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('expense_accno_id', (select id from chart where accno = '5020'));