From: Moritz Bunkus Date: Wed, 29 Dec 2010 14:46:29 +0000 (+0100) Subject: Falsche Zuordnung zweier Konten bzgl. BWA X-Git-Tag: release-2.6.2beta1~45^2~2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=546fc6e58b1452db259cc01eea122f11e6595ec9;p=kivitendo-erp.git Falsche Zuordnung zweier Konten bzgl. BWA Fix für Bug 1277. --- diff --git a/sql/Germany-DATEV-SKR03EU-chart.sql b/sql/Germany-DATEV-SKR03EU-chart.sql index 76aa62e57..dfa377a07 100644 --- a/sql/Germany-DATEV-SKR03EU-chart.sql +++ b/sql/Germany-DATEV-SKR03EU-chart.sql @@ -73,7 +73,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 ('4220', 'Pacht', 'A', 'E', 'AP_amount', '4220', 0, NULL, NULL, NULL, 11, FALSE); INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4230', 'Heizung', 'A', 'E', 'AP_amount', '4230', 9, NULL, 11, 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 ('4240', 'Gas,Strom, Wasser', 'A', 'E', 'AP_amount', '4240', 9, NULL, 11, NULL, 12, FALSE); -INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4250', 'Reinigung', 'A', 'E', 'AP_amount', '4250', 9, NULL, NULL, 11, 24, FALSE); +INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4250', 'Reinigung', 'A', 'E', 'AP_amount', '4250', 9, NULL, 11, NULL, 24, FALSE); INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4260', 'Instandhaltung betrieb.Räume', 'A', 'E', 'AP_amount', '4260', 9, NULL, 11, NULL, 13, FALSE); INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4280', 'Sonstige Raumkosten', 'A', 'E', 'AP_amount', '4280', 9, NULL, 11, NULL, 13, FALSE); INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4301', 'Nicht abziehbare Vorsteuer 7%', 'A', 'E', 'AP_paid', '4301', 0, NULL, 20, NULL, NULL, FALSE); @@ -94,7 +94,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 ('4570', 'Leasingfahrzeugkosten', 'A', 'E', 'AP_amount', '4570', 0, 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 ('4580', 'Sonstige Kfz-Kosten', 'A', 'E', 'AP_amount', '4580', 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 ('4600', 'Werbe-und Reisekosten', 'A', 'E', 'AP_amount', '4600', 9, NULL, 15, NULL, 18, FALSE); -INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4610', 'Werbekosten', 'A', 'E', 'AP_amount', '4610', 9, NULL, NULL, 15, 18, FALSE); +INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4610', 'Werbekosten', 'A', 'E', 'AP_amount', '4610', 9, NULL, 15, NULL, 18, FALSE); INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4638', 'Geschenke ausschließl.betrieb.genut', 'A', 'E', 'AP_amount', '4638', 9, NULL, NULL, NULL, 18, FALSE); INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4640', 'Repräsentationskosten', 'A', 'E', 'AP_amount', '4640', 9, NULL, 15, NULL, 18, FALSE); INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4650', 'Bewirtungskosten', 'A', 'E', 'AP_amount', '4650', 9, NULL, 20, NULL, 18, FALSE); diff --git a/sql/Pg-upgrade2/skr03_04_bwa_zuordnung_konten_4250_4610.sql b/sql/Pg-upgrade2/skr03_04_bwa_zuordnung_konten_4250_4610.sql new file mode 100644 index 000000000..40cd29820 --- /dev/null +++ b/sql/Pg-upgrade2/skr03_04_bwa_zuordnung_konten_4250_4610.sql @@ -0,0 +1,27 @@ +-- @tag: skr03_04_bwa_zuordnung_konten_4250_4610 +-- @description: Fehler in der BWA-Zuordnung +-- @depends: release_2_6_1 +-- @charset: utf-8 + +-- SKR03 +UPDATE chart + SET pos_bwa = 11, pos_bilanz = NULL + WHERE (accno = '4250') + AND ((SELECT coa FROM defaults LIMIT 1) = 'Germany-DATEV-SKR03EU'); + +UPDATE chart + SET pos_bwa = 15, pos_bilanz = NULL + WHERE (accno = '4610') + AND ((SELECT coa FROM defaults LIMIT 1) = 'Germany-DATEV-SKR03EU'); + +-- SKR04 +UPDATE chart + SET pos_bwa = 11, pos_bilanz = NULL + WHERE (accno = '6330') + AND ((SELECT coa FROM defaults LIMIT 1) = 'Germany-DATEV-SKR04EU'); + +UPDATE chart + SET pos_bwa = 15, pos_bilanz = NULL + WHERE (accno = '6600') + AND ((SELECT coa FROM defaults LIMIT 1) = 'Germany-DATEV-SKR04EU'); +