Einige Korrekturen zu Kontennamen in den zwei deutschen Kontenrahmen.

diff --git a/sql/Germany-DATEV-SKR03EU-chart.sql b/sql/Germany-DATEV-SKR03EU-chart.sql
index 47bbbd6..76aa62e 100644 (file)
--- a/sql/Germany-DATEV-SKR03EU-chart.sql
+++ b/sql/Germany-DATEV-SKR03EU-chart.sql
@@ -84,7 +84,7 @@ 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 ('4355', 'Ökosteuer', 'A', 'E', '', '4355', 0, NULL, 12, 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 ('4396', 'Steuerl.abzugs.Verspätungszuschl.u.Zwangsgelder', 'A', 'E', '', '4396', 0, NULL, NULL, NULL, 31, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4397', 'Steuerl.n.abzugsf.Verspätungszuschläge u.Zwangsgelder', 'A', 'E', '', '4397', 0, NULL, NULL, NULL, 31, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4500', 'Fahrzugkosten', 'A', 'E', 'AP_amount', '4500', 0, NULL, NULL, NULL, 17, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4500', 'Fahrzeugkosten', 'A', 'E', 'AP_amount', '4500', 0, NULL, NULL, NULL, 17, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4530', 'Laufende Kfz-Betriebskosten', 'A', 'E', 'AP_amount', '4530', 9, NULL, 14, NULL, 17, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8100', 'Steuerfreie Umsätze §4Nr.8ff UstG', 'A', 'I', 'AR_amount', '8100', 0, 0, 1, NULL, NULL, TRUE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8110', 'Sonstige steuerfreie Umsätze Inland', 'A', 'I', 'AR_amount', '8110', 0, NULL, NULL, NULL, 1, TRUE);
@@ -169,13 +169,13 @@ 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 ('8790', 'Gewährte Rabatte 16% Ust.', 'A', 'E', 'AR_paid', '8790', 3, 51, 1, NULL, 1, TRUE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8820', 'Erlöse aus Anlageverkäufen Sachanl.verm.b.Buchgewinn16%Ust', 'A', 'I', 'AR_amount', '8820', 3, 51, 5, NULL, 1, TRUE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8829', 'Erl.a.Anlagenverk.bei Buchgewinn', 'A', 'I', 'AR_amount', '8829', 3, NULL, NULL, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8900', 'Unentgeldliche Wertabgaben', 'A', 'I', 'AR_amount', '8900', 0, NULL, NULL, NULL, 1, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8900', 'Unentgeltliche Wertabgaben', 'A', 'I', 'AR_amount', '8900', 0, NULL, NULL, NULL, 1, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8905', 'Entnahme v. Gegenst.o.USt.', 'A', 'I', '', '8905', 0, NULL, 5, NULL, 2, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8910', 'Entnahme des Untern.f.Zwecke ausserh.d.Untern 16%(Waren)', 'A', 'I', 'AR_amount', '8910', 3, 51, 5, NULL, 3, TRUE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8915', 'Entnah.d.Untern.f.Zwecke ausserh.d.Untern.7%USt', 'A', 'I', 'AR_amount', '8915', 2, 86, 5, NULL, 3, TRUE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8919', 'Entnahme durch den Untern.f.Zwecke außerhalb d.Untern.(Waren)o.USt', 'A', 'I', '', '8919', 0, NULL, 5, NULL, 3, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8924', 'Verwendung v.Gegenständen f.Zwecke außerhalb d.Untern.o.USt.', 'A', 'I', '', '8924', 0, NULL, NULL, NULL, 3, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8925', 'Unentgeldl.Erbring.sons.Leis.16%USt', 'A', 'I', 'AR_amount', '8925', 3, 51, NULL, NULL, 3, TRUE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8925', 'Unentgeltl.Erbring.sons.Leis.16%USt', 'A', 'I', 'AR_amount', '8925', 3, 51, NULL, NULL, 3, TRUE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8930', 'Verwendung v.Gegenst.f.Zwecke außerhalb d.Unternehmens 7% USt.', 'A', 'I', 'AR_amount', '8930', 2, 86, 5, NULL, 3, TRUE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8935', 'Unentgeltl.Zuwend.v.Gegens. 16% Ust', 'A', 'I', 'AR_amount', '8935', 3, 51, NULL, NULL, 3, TRUE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8950', 'Nicht steuerbare Umsätze', 'A', 'I', '', '8950', 0, NULL, 5, NULL, 1, FALSE);
@@ -301,7 +301,7 @@ 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 ('2739', 'Erträge Aufl. Sopo m.R.(Ansparafa)', 'A', 'I', '', '2739', 0, NULL, 5, 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 ('8590', 'Verrechnete sons. Sachbezüge keine Waren', 'A', 'I', 'AR_amount', '8590', 0, 0, 5, NULL, 2, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8920', 'Verw.v.Gegens.f.Zwecke ausserh.d.Untern.16%USt.', 'A', 'I', '', '8920', 3, 51, 5, NULL, 3, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8939', 'Unentgeldl.Zuw.v.Gegens.ohne Ust', 'A', 'I', '', '8939', 0, NULL, 5, NULL, 3, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8939', 'Unentgeltl.Zuw.v.Gegens.ohne Ust', 'A', 'I', '', '8939', 0, NULL, 5, NULL, 3, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8940', 'Unentgeltl.Zuw.v Waren 16% Ust', 'A', 'I', '', '8940', 3, 51, 5, NULL, 3, TRUE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8945', 'Unentgeltl.Zuw.von Waren 7% Ust', 'A', 'I', '', '8945', 2, 86, 5, NULL, 3, TRUE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('8949', 'Unentgeltl.Zuwendung v.Waren o.USt.', 'A', 'I', '', '8949', 0, NULL, 5, NULL, 3, FALSE);

diff --git a/sql/Germany-DATEV-SKR04EU-chart.sql b/sql/Germany-DATEV-SKR04EU-chart.sql
index fffd56a..8ad0b4c 100644 (file)
--- a/sql/Germany-DATEV-SKR04EU-chart.sql
+++ b/sql/Germany-DATEV-SKR04EU-chart.sql
@@ -90,7 +90,7 @@ 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 ('4581', 'Erlöse zum ermä.Umsatzsteuersatz (EÜR)', 'A', 'I', '', '4581', 0, 0, 1, NULL, 1, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4582', 'Erlöse steuerfrei u.nicht steuerbar (EÜR)', 'A', 'I', '', '4582', 0, 0, 1, NULL, 1, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4589', 'Gegenkonto 8580-8582 b.Aufteilung d.Erlöse n.Steuersätzen(EÜR)', 'A', 'C', '', '4589', 0, NULL, NULL, NULL, NULL, FALSE);\r
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4600', 'Unentgeldliche Wertabgaben', 'A', 'I', 'AR_amount', '4600', 0, NULL, NULL, NULL, 1, FALSE);\r
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4600', 'Unentgeltliche Wertabgaben', 'A', 'I', 'AR_amount', '4600', 0, NULL, NULL, NULL, 1, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4605', 'Entnahme v. Gegenst.o.USt.', 'A', 'I', '', '4605', 0, NULL, 5, NULL, 2, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4610', 'Entnah.d.Untern.f.Zwecke ausserh.d.Untern.7%USt', 'A', 'I', 'AR_amount', '4610', 2, 86, 5, NULL, 3, TRUE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4619', 'Entnahme durch den Untern.f.Zwecke außerhalb d.Untern.(Waren)o.USt', 'A', 'I', '', '4619', 0, NULL, 5, NULL, 3, FALSE);\r
@@ -100,12 +100,12 @@ 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 ('4640', 'Verw.v.Gegens.f.Zwecke ausserh.d.Untern.16%USt.', 'A', 'I', '', '4640', 3, 51, 5, NULL, 3, TRUE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4645', 'Verwend.v.Gegenst.f.Zwecke außerh.d.Untern.16%USt(Kfz-Nutzung)', 'A', 'I', '', '4645', 0, 0, 5, NULL, 3, TRUE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4646', 'Verwend.f.Gegenst.f.Zwecke außerh.d.Untern.16%USt(Telefonnutzung)', 'A', 'I', '', '4646', 0, 0, 5, NULL, 3, TRUE);\r
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4660', 'Unentgeldl.Erbring.sons.Leis.16%USt', 'A', 'I', 'AR_amount', '4660', 3, 51, NULL, NULL, 3, TRUE);\r
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4660', 'Unentgeltl.Erbring.sons.Leis.16%USt', 'A', 'I', 'AR_amount', '4660', 3, 51, NULL, NULL, 3, TRUE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4670', 'Unentgeltl.Zuw.von Waren 7% Ust', 'A', 'I', '', '4670', 2, 86, 5, NULL, 3, TRUE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4679', 'Unentgeltl.Zuwendung v.Waren o.USt.', 'A', 'I', '', '4679', 0, NULL, 5, NULL, 3, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4680', 'Unentgeltl.Zuw.v Waren 16% Ust', 'A', 'I', '', '4680', 3, 51, 5, NULL, 3, TRUE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4686', 'Unentgeltl.Zuwend.v.Gegens. 16% Ust', 'A', 'I', 'AR_amount', '4686', 3, 51, NULL, NULL, 3, TRUE);\r
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4689', 'Unentgeldl.Zuw.v.Gegens.ohne Ust', 'A', 'I', '', '4689', 0, NULL, 5, NULL, 3, FALSE);\r
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4689', 'Unentgeltl.Zuw.v.Gegens.ohne Ust', 'A', 'I', '', '4689', 0, NULL, 5, NULL, 3, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4690', 'Nicht steuerbare Umsätze', 'A', 'I', '', '4690', 0, NULL, 5, NULL, 1, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4695', 'Umsatzsteuervergütungen', 'A', 'I', '', '4695', 0, NULL, NULL, NULL, 7, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4700', 'Erlösschmälerungen', 'A', 'I', '', '4700', 0, NULL, 32, NULL, 1, FALSE);\r
@@ -247,7 +247,7 @@ 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 ('6490', 'Sonstige Reparaturen u.Instandhalt.', 'A', 'E', 'AP_amount', '6490', 9, NULL, NULL, NULL, 19, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6498', 'Mietleasing', 'A', 'E', 'AP_amount', '6498', 0, NULL, 20, NULL, 24, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6499', 'Gewerbest.zu berücksicht.Mietleasing §8 GewStG', 'A', 'E', '', '6499', 0, NULL, NULL, NULL, 24, FALSE);\r
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6500', 'Fahrzugkosten', 'A', 'E', 'AP_amount', '6500', 0, NULL, NULL, NULL, 17, FALSE);\r
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6500', 'Fahrzeugkosten', 'A', 'E', 'AP_amount', '6500', 0, NULL, NULL, NULL, 17, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6520', 'Kfz-Versicherungen', 'A', 'E', 'AP_amount', '6520', 0, NULL, 14, NULL, 16, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6530', 'Laufende Kfz-Betriebskosten', 'A', 'E', 'AP_amount', '6530', 9, NULL, 14, NULL, 17, FALSE);\r
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6540', 'Kfz-Reparaturen', 'A', 'E', 'AP_amount', '6540', 9, NULL, 14, NULL, 17, FALSE);\r

diff --git a/sql/Pg-upgrade2/chart_names2.sql b/sql/Pg-upgrade2/chart_names2.sql
new file mode 100644 (file)
index 0000000..54abff7
--- /dev/null
+++ b/sql/Pg-upgrade2/chart_names2.sql
@@ -0,0 +1,13 @@
+-- @tag: chart_names2
+-- @description: Behebt ein paar Schreibfehler in Kontennamen in den Kontenramen SKR03 und SKR04.
+-- @depends:
+UPDATE chart
+  SET description = 'Fahrzeugkosten'
+  WHERE
+    ((SELECT coa FROM defaults) IN ('Germany-DATEV-SKR03EU', 'Germany-DATEV-SKR04EU')) AND
+    (description = 'Fahrzugkosten');
+UPDATE chart
+  SET description = replace(description, 'Unentgeld', 'Unentgelt')
+  WHERE
+    ((SELECT coa FROM defaults) IN ('Germany-DATEV-SKR03EU', 'Germany-DATEV-SKR04EU')) AND
+    (description LIKE '%Unentgelt%');