Falsche Kontenklasse für Konten 3151, 3160, 3170 im SKR04

Fix für Bug 1449.

diff --git a/sql/Germany-DATEV-SKR04EU-chart.sql b/sql/Germany-DATEV-SKR04EU-chart.sql
index b055882819dfc5db8933a01b2947c2e30431c62d..43491b7d7912b74534ded59c88a476979362ddd9 100644 (file)
--- a/sql/Germany-DATEV-SKR04EU-chart.sql
+++ b/sql/Germany-DATEV-SKR04EU-chart.sql
@@ -53,9 +53,9 @@ INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, ta
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2230', 'Sonderausgaben unbeschränkt abzugsfähig',                             'A', 'Q', '',                                       '2230', 0,    NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2250', 'Zuwendungen, Spenden',                                                'A', 'Q', '',                                       '2250', 0,    NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2950', 'Satzungsmäßige Rücklagen',                                            'A', 'Q', '',                                       '2953', 0,    NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2230', 'Sonderausgaben unbeschränkt abzugsfähig',                             'A', 'Q', '',                                       '2230', 0,    NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2250', 'Zuwendungen, Spenden',                                                'A', 'Q', '',                                       '2250', 0,    NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2950', 'Satzungsmäßige Rücklagen',                                            'A', 'Q', '',                                       '2953', 0,    NULL, NULL, NULL, NULL, FALSE);

-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3151', 'Verbindlk. geg Krditinst. - Restlzeit <1 Jahr ',                      'A', 'A', '',                                       '3151', 0,    NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3160', 'Verbindlk. geg Krditinst. - Restlzeit 1 - 5 Jahre ',                  'A', 'A', '',                                       '3160', 0,    NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3170', 'Verbindlk. geg Krditinst. - Restlzeit >5 Jahre',                      'A', 'A', '',                                       '3170', 0,    NULL, NULL, NULL, NULL, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3151', 'Verbindlk. geg Krditinst. - Restlzeit <1 Jahr ',                      'A', 'L', '',                                       '3151', 0,    NULL, NULL, NULL, NULL, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3160', 'Verbindlk. geg Krditinst. - Restlzeit 1 - 5 Jahre ',                  'A', 'L', '',                                       '3160', 0,    NULL, NULL, NULL, NULL, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3170', 'Verbindlk. geg Krditinst. - Restlzeit >5 Jahre',                      'A', 'L', '',                                       '3170', 0,    NULL, NULL, NULL, NULL, FALSE);

 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3300', 'Verbindlichkeiten aus Lief.u.Leist.',                                 'A', 'L', 'AP',                                     '3300', 0,    NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3305', 'Verbindlk. aus LuL zum allg. USTsatz (EÜR)',                          'A', 'L', 'AP',                                     '3305', 0,    NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3306', 'Verbindlk. aus LuL zum erm. USTsatz (EÜR)',                           'A', 'L', 'AP',                                     '3306', 0,    NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3300', 'Verbindlichkeiten aus Lief.u.Leist.',                                 'A', 'L', 'AP',                                     '3300', 0,    NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3305', 'Verbindlk. aus LuL zum allg. USTsatz (EÜR)',                          'A', 'L', 'AP',                                     '3305', 0,    NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3306', 'Verbindlk. aus LuL zum erm. USTsatz (EÜR)',                           'A', 'L', 'AP',                                     '3306', 0,    NULL, NULL, NULL, NULL, FALSE);

diff --git a/sql/Pg-upgrade2/skr04_fix_category_3151_3160_3170.sql b/sql/Pg-upgrade2/skr04_fix_category_3151_3160_3170.sql
new file mode 100644 (file)
index 0000000..1e2d3d4
--- /dev/null
+++ b/sql/Pg-upgrade2/skr04_fix_category_3151_3160_3170.sql
@@ -0,0 +1,8 @@
+-- @tag: skr04_fix_category_3151_3160_3170
+-- @description: Falscher Kontentyp von 3151, 3160, 3170 im SKR04
+-- @depends: release_2_6_1
+-- @charset: utf-8
+UPDATE chart
+  SET category = 'L'
+  WHERE (accno IN ('3151', '3160', '3170'))
+    AND ((SELECT coa FROM defaults LIMIT 1) = 'Germany-DATEV-SKR04EU');