Fixing 1804712 and some related issues

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

3 files changed, 13 insertions, 8 deletions

diff --git a/sql/coa/be/chart/General.sql b/sql/coa/be/chart/General.sql
index 035c4071..7c19c30a 100755
--- a/sql/coa/be/chart/General.sql
+++ b/sql/coa/be/chart/General.sql
@@ -425,11 +425,11 @@ INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, co
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, contra) VALUES ('763750', '+Val.s/mat.informatique', 'A', 'I', '', '76', '0');
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, contra) VALUES ('406', 'Acomptes versés - Vooruitbetalingen', 'A', 'A', 'AP_paid', '40', '0');
 --
-INSERT INTO tax (chart_id, rate, taxnumber) VALUES ((SELECT id FROM chart WHERE accno = '411590'), 0.06);
-INSERT INTO tax (chart_id, rate, taxnumber) VALUES ((SELECT id FROM chart WHERE accno = '411591'), 0.21);
-INSERT INTO tax (chart_id, rate, taxnumber) VALUES ((SELECT id FROM chart WHERE accno = '451540'), 0.06);
-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);
+INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '411590'), 0.06);
+INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '411591'), 0.21);
+INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '451540'), 0.06);
+INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '451541'), 0.21);
+INSERT INTO tax (chart_id, rate) VALUES ((SELECT id FROM chart WHERE accno = '640700'), 0.21);
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (SELECT 
 id FROM chart WHERE accno = '340'));
diff --git a/sql/coa/eg/chart/General.sql b/sql/coa/eg/chart/General.sql
index 135b2a01..a0e7a48f 100755
--- a/sql/coa/eg/chart/General.sql
+++ b/sql/coa/eg/chart/General.sql
@@ -84,7 +84,7 @@ INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (SELECT
  INSERT INTO defaults (setting_key, value) VALUES ('fxloss_accno_id', (SELECT id FROM chart WHERE accno = '5810'));
 
  INSERT INTO defaults (setting_key, value) VALUES ('weightunit', 'kg');
-INSERT INTO defaults (setting_key, value) VALUES ('curr', 'USD:CAD:EUR';
+INSERT INTO defaults (setting_key, value) VALUES ('curr', 'USD:CAD:EUR');
 
 INSERT INTO tax (chart_id,rate,taxnumber) VALUES ((SELECT id FROM chart WHERE accno = '2310'),'0.1',NULL);
 INSERT INTO tax (chart_id,rate,taxnumber) VALUES ((SELECT id FROM chart WHERE accno = '2320'),'0.14',NULL);
diff --git a/sql/coa/pl/chart/General.sql b/sql/coa/pl/chart/General.sql
index c31bc1cf..dd21c715 100755
--- a/sql/coa/pl/chart/General.sql
+++ b/sql/coa/pl/chart/General.sql
@@ -340,9 +340,14 @@ INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select
 
  INSERT INTO defaults (setting_key, value) VALUES ('fxgain_accno_id', (select id from chart where accno = '775060000'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('fxloss_accno_id', (select id from chart where accno = '775140000'), invnumber = '1000', sonumber = '1000', ponumber = '1000', curr = 'PLN:USD:EUR');
+INSERT INTO defaults (setting_key, value) VALUES ('fxloss_accno_id', (select id from chart where accno = '775140000'));
 
- INSERT INTO defaults (setting_key, value) VALUES ('weightunit', 'kg');
+INSERT INTO defaults (setting_key, value) VALUES ('invnumber', '1000');
+INSERT INTO defaults (setting_key, value) VALUES ('curr' 'PLN:USD:EUR');
+INSERT INTO defaults (setting_key, value) VALUES ('weightunit', 'kg');
+
+UPDATE defaults SET value = '1000' WHERE setting_key = 'sonumber';
+UPDATE defaults SET value = '1000' WHERE setting_key = 'ponumber';
 --