Überreste von CT_tax entfernt

Wird nirgends mehr verwendet, bzw. sind die aufgerufenen
Funktionen dazu schon lange auskommentiert. Auch aus den
Kontenrahmen und Updatescripts entfernt, da beim Speichern
eines Kontos die CT_tax Information in link eh verloren geht.

Es gibt in rp.pl auch noch Referenzen auf die Berichte
"tax_collected" und "tax_paid", aber keine Menüpunkte oder
Druckvorlagen dazu, können die auch raus?

diff --git a/SL/AM.pm b/SL/AM.pm
index b2730ce..f6c93ad 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -210,7 +210,7 @@ sub save_account {
   # sanity check, can't have AR with AR_...
   if ($form->{AR} || $form->{AP} || $form->{IC}) {
     map { delete $form->{$_} }
-      qw(AR_amount AR_tax AR_paid AP_amount AP_tax AP_paid IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice CT_tax);
+      qw(AR_amount AR_tax AR_paid AP_amount AP_tax AP_paid IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice);
   }
 
   $form->{link} = "";
@@ -221,7 +221,7 @@ sub save_account {
                     $form->{IC},            $form->{IC_sale},
                     $form->{IC_cogs},       $form->{IC_taxpart},
                     $form->{IC_income},     $form->{IC_expense},
-                    $form->{IC_taxservice}, $form->{CT_tax}
+                    $form->{IC_taxservice}
     ) {
     $form->{link} .= "${item}:" if ($item);
   }

diff --git a/SL/RP.pm b/SL/RP.pm
index e0ed0b4..f98d475 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -1293,27 +1293,6 @@ sub get_customer {
   $main::lxdebug->leave_sub();
 }
 
-sub get_taxaccounts {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  # get tax accounts
-  my $query =
-    qq|SELECT c.accno, c.description, t.rate
-       FROM chart c, tax t
-       WHERE (c.link LIKE '%CT_tax%') AND (c.id = t.chart_id)
-       ORDER BY c.accno|;
-  $form->{taxaccounts} = selectall_hashref_query($form, $dbh, $query);
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
 sub tax_report {
   $main::lxdebug->enter_sub();
 

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 04b0e9a..73a2133 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -560,7 +560,6 @@ sub list_account_details {
                : ( $link eq 'IC_income' )     ? $locale->text('Account Link IC_income')
                : ( $link eq 'IC_expense' )    ? $locale->text('Account Link IC_expense')
                : ( $link eq 'IC_taxservice' ) ? $locale->text('Account Link IC_taxservice')
-#               : ( $link eq 'CT_tax' )        ? $locale->text('Account Link CT_tax')
                : $locale->text('Unknown Link') . ': ' . $link;
       $ca->{link} .= ($link ne '') ?  "[$link] ":'';
     }

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 4bc4673..aaf47ff 100644 (file)
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -158,20 +158,9 @@ sub report {
   my $is_bwa              = $::form->{report} eq "bwa";
   my $is_balance_sheet    = $::form->{report} eq "balance_sheet";
   my $is_trial_balance    = $::form->{report} eq "trial_balance";
-  my $is_taxreport        = $::form->{report} =~ /^tax_/;
-  my $is_nontaxable       = $::form->{report} =~ /^nontaxable_/;
   my $is_aging            = $::form->{report} =~ /^a[rp]_aging$/;
   my $is_payments         = $::form->{report} =~ /(receipts|payments)$/;
 
-#  if (is_taxreport) {
-#    $::form->{db} = ($::form->{report} =~ /_collected/) ? "ar" : "ap";
-#    RP->get_taxaccounts(\%::myconfig, $::form);
-#  }
-#
-#  if ($is_nontaxable) {
-#    $::form->{db} = ($::form->{report} =~ /_sales/) ? "ar" : "ap";
-#  }
-
   my ($label, $nextsub, $vc);
   if ($is_aging) {
     my $is_sales  = $::form->{report} eq 'ar_aging';

diff --git a/locale/de/all b/locale/de/all
index bc1371e..b662545 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -73,7 +73,6 @@ $self->{texts} = {
   'Account Link AR_amount'      => 'Forderungen Erlöskonto',
   'Account Link AR_paid'        => 'Forderungen Zahlungseingang',
   'Account Link AR_tax'         => 'Forderungen Steuer',
-  'Account Link CT_tax'         => 'Kunde/Lieferant Steuer',
   'Account Link IC'             => 'Inventar',
   'Account Link IC_cogs'        => 'Warenliste Aufwandskonto',
   'Account Link IC_expense'     => 'Dienstleistungen Aufwandskonto',

diff --git a/locale/de_DE/all b/locale/de_DE/all
index 379570e..cab3c0b 100644 (file)
--- a/locale/de_DE/all
+++ b/locale/de_DE/all
@@ -83,7 +83,6 @@ $self->{texts} = {
   'Account Link AR_amount'      => 'Forderungen Erlöskonto',
   'Account Link AR_paid'        => 'Forderungen Zahlungseingang',
   'Account Link AR_tax'         => 'Forderungen Steuer',
-  'Account Link CT_tax'         => 'Kunde/Lieferant Steuer',
   'Account Link IC'             => 'Inventar',
   'Account Link IC_cogs'        => 'Warenliste Aufwandskonto',
   'Account Link IC_expense'     => 'Dienstleistungen Aufwandskonto',

diff --git a/locale/en/all b/locale/en/all
index 879d1ac..35aedaf 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -83,7 +83,6 @@ $self->{texts} = {
   'Account Link AR_amount'      => '',
   'Account Link AR_paid'        => '',
   'Account Link AR_tax'         => '',
-  'Account Link CT_tax'         => '',
   'Account Link IC'             => '',
   'Account Link IC_cogs'        => '',
   'Account Link IC_expense'     => '',

diff --git a/locale/fr/missing b/locale/fr/missing
index 9c73bac..07b7b7b 100644 (file)
--- a/locale/fr/missing
+++ b/locale/fr/missing
@@ -75,7 +75,6 @@ $missing = {
   'Account Link AR_amount'      => '',
   'Account Link AR_paid'        => '',
   'Account Link AR_tax'         => '',
-  'Account Link CT_tax'         => '',
   'Account Link IC'             => '',
   'Account Link IC_cogs'        => '',
   'Account Link IC_expense'     => '',

diff --git a/sql/Austria-chart.sql b/sql/Austria-chart.sql
index 85810c5..8a6088f 100644 (file)
--- a/sql/Austria-chart.sql
+++ b/sql/Austria-chart.sql
@@ -62,12 +62,12 @@ insert into chart (accno,description,charttype,gifi_accno,category,link) values
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3500','VERBINDLICHKEITEN FINANZAMT','H','35','L','');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3510','Finanzamt Verrechnung Körperschaftssteuer','A','350-359','L','');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3520','Finanzamt Verrechnung Umsatzsteuer','A','350-359','L','');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3530','Mehrwertsteuer 0%','A','350-359','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice:CT_tax');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3531','Mehrwertsteuer 10%','A','350-359','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice:CT_tax');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3532','Mehrwertsteuer 20%','A','350-359','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice:CT_tax');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3540','Vorsteuer 0%','A','350-359','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice:CT_tax');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3541','Vorsteuer 10%','A','350-359','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice:CT_tax');
-insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3542','Vorsteuer 20%','A','350-359','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice:CT_tax');
+insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3530','Mehrwertsteuer 0%','A','350-359','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice');
+insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3531','Mehrwertsteuer 10%','A','350-359','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice');
+insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3532','Mehrwertsteuer 20%','A','350-359','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice');
+insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3540','Vorsteuer 0%','A','350-359','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice');
+insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3541','Vorsteuer 10%','A','350-359','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice');
+insert into chart (accno,description,charttype,gifi_accno,category,link) values ('3542','Vorsteuer 20%','A','350-359','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4000','UMSATZ','H','4','I','');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4020','Verkauf - Hardware','A','40-44','I','AR_amount:IC_sale');
 insert into chart (accno,description,charttype,gifi_accno,category,link) values ('4030','Verkauf - Software ','A','40-44','I','AR_amount:IC_sale');

diff --git a/sql/France-chart.sql b/sql/France-chart.sql
index a34e013..38f9ebe 100644 (file)
--- a/sql/France-chart.sql
+++ b/sql/France-chart.sql
@@ -900,10 +900,10 @@ INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "categor
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('445500', 'TAXES SUR CA A DECAISSER', 'A', '', '', '');
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('706000', 'PRESTATIONS DE SERVICES', 'A', '', 'I', 'IC_income');
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('707000', 'VENTES DE MARCHANDISES', 'A', '', 'I', 'IC_sale');
-INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('445713', 'TVA COLLECTEE 19.6%', 'A', '', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax');
+INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('445713', 'TVA COLLECTEE 19.6%', 'A', '', 'I', 'AR_tax:IC_taxpart:IC_taxservice');
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('512020', 'BANQUE DEBIT', 'A', '', 'E', 'AP');
-INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('445711', 'TVA COLLECTEE  5.5%', 'A', '', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax');
-INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('445661', 'TVA DEDUCTIBLE  5.5%', 'A', '', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax');
+INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('445711', 'TVA COLLECTEE  5.5%', 'A', '', 'I', 'AR_tax:IC_taxpart:IC_taxservice');
+INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('445661', 'TVA DEDUCTIBLE  5.5%', 'A', '', 'E', 'AP_tax:IC_taxpart:IC_taxservice');
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('512010', 'BANQUE CREDIT', 'A', '', 'I', 'AR:AR_amount');
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('681730', 'STOCKS ET EN-COURS', 'A', '', 'A', 'IC');
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('580010', 'VIREMENT INTERNE', 'A', '', 'E', '');
@@ -930,7 +930,7 @@ INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "categor
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('609400', 'D\'ETUDES & PRESTATIONS DE SERVICES', 'A', '', '', '');
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('625100', 'VOYAGES ET DEPLACEMENTS', 'A', '', 'E', 'AP_amount');
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('618300', 'DOCUMENTATION TECHNIQUE', 'A', '', 'E', 'AP_amount');
-INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('445663', 'TVA DEDUCTIBLE 19.6%', 'A', '', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax');
+INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('445663', 'TVA DEDUCTIBLE 19.6%', 'A', '', 'E', 'AP_tax:IC_taxpart:IC_taxservice');
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('601000', 'ACHATS STOCKES MAT. PREM. (FOURN.)', 'A', '', 'E', 'AP_amount:IC_cogs');
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('626000', 'FRAIS POSTAUX ET TELECOMMUNIC.', 'A', '', 'E', 'AP_amount');
 INSERT INTO "chart" ("accno", "description", "charttype", "gifi_accno", "category", "link") VALUES ('512000', 'BANQUE', 'A', '', 'A', 'AR_paid:AP_paid');

diff --git a/sql/Germany-DATEV-SKR03EU-chart.sql b/sql/Germany-DATEV-SKR03EU-chart.sql
index dfa377a..1ef43a4 100644 (file)
--- a/sql/Germany-DATEV-SKR03EU-chart.sql
+++ b/sql/Germany-DATEV-SKR03EU-chart.sql
@@ -194,8 +194,8 @@ 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 ('0650', 'Vblk.geg.Kreditinst.- Restlaufzeit grösser als 5 Jahre', 'A', 'A', '', '0650', 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 ('4510', 'Kfz-Steuer', 'A', 'E', 'AP_amount', '4510', 0, NULL, 19, NULL, 15, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4520', 'Kfz-Versicherungen', 'A', 'E', 'AP_amount', '4520', 0, NULL, 14, NULL, 16, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1771', 'Umsatzsteuer 7%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '1771', 0, NULL, NULL, NULL, 5, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1775', 'Umsatzsteuer 16%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '1775', 0, NULL, NULL, NULL, 6, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1771', 'Umsatzsteuer 7%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice', '1771', 0, NULL, NULL, NULL, 5, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1775', 'Umsatzsteuer 16%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice', '1775', 0, NULL, NULL, NULL, 6, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1767', 'Im anderen EG-Staat steuerpfl. Lieferung', 'A', ' ', '', '1767', 10, NULL, 0, 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 ('0853', 'Satzungsm.Rücklagen 0% Vorbelast.(st.Einlagekto.)', 'A', 'Q', '', '0853', 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 ('1607', 'Vblk.a.LuL ohne Vorsteuer (EÜR)', 'A', 'L', 'AP', '1607', 0, NULL, NULL, NULL, NULL, FALSE);
@@ -259,9 +259,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 ('8922', 'Verwend.f.Gegenst.f.Zwecke außerh.d.Untern.16%USt(Telefonnutzung)', 'A', 'I', '', '8922', 0, 0, 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 ('1000', 'Kasse', 'A', 'A', 'AR_paid:AP_paid', '1000', 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 ('1572', 'Steuerpflicht. EG-Erwerb 7%', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', '1572', 0, 61, NULL, NULL, 27, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1571', 'Abziehbare Vorsteuer 7%', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1570', 0, 66, NULL, NULL, 27, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1571', 'Abziehbare Vorsteuer 7%', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', '1570', 0, 66, NULL, NULL, 27, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1573', 'Steuerpflicht. EG-Erwerb 16%', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', '1573', 0, 61, NULL, NULL, 27, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1575', 'Abziehbare Vorsteuer 16%', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1570', 0, 66, NULL, NULL, 27, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1575', 'Abziehbare Vorsteuer 16%', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', '1570', 0, 66, NULL, NULL, 27, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1772', 'Steuerpflicht. EG-Lieferungen 7%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice', '1772', 0, NULL, NULL, NULL, 6, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1773', 'Steuerpflicht. EG-Lieferungen 16%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice', '1773', 0, NULL, NULL, NULL, 28, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2501', 'Ausserordentliche Erträge finanzwirksam', 'A', 'I', '', '2501', 0, NULL, NULL, NULL, 5, FALSE);
@@ -284,8 +284,8 @@ 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 ('3090', 'Energiestoffe (Fert.).', 'A', 'E', 'IC', '3090', 9, 0, 4, NULL, 8, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4595', 'Fremdfahrzeuge', '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 ('1450', 'Ford.a.LuL n.Durchschnittss.gem.§24UStG(EÜR)', 'A', 'A', 'AR', '1448', 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 ('1577', 'Abzieb.Vorst.n.allg.Durchschnittss.UStVA Kz.63', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1577', 0, NULL, NULL, NULL, 27, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1578', 'Abzieb.Vorst.n.§13b', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1578', 0, NULL, NULL, NULL, 27, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1577', 'Abzieb.Vorst.n.allg.Durchschnittss.UStVA Kz.63', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', '1577', 0, NULL, NULL, NULL, 27, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1578', 'Abzieb.Vorst.n.§13b', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', '1578', 0, NULL, NULL, NULL, 27, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1580', 'Gegenkonto Vorsteuer §4/3 EStG', 'A', 'A', '', '1580', 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 ('1581', 'Auflösung Vorst.a.Vorjahr §4/3 EStG', 'A', 'A', '', '1581', 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 ('1582', 'Vorst.aus Investitionen §4/3 EStG', 'A', 'E', '', '1582', 0, NULL, NULL, NULL, 27, FALSE);
@@ -395,9 +395,9 @@ INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SEL
 insert into taxkeys (chart_id, tax_id, taxkey_id, pos_ustva, startdate) select chart.id, tax.id, taxkey_id, pos_ustva, '1970-01-01' from chart LEFT JOIN tax on (tax.taxkey=chart.taxkey_id) WHERE taxkey_id is not null;
 insert into taxkeys (chart_id, tax_id, taxkey_id,startdate) SELECT 0, id, taxkey, '1970-01-01' FROM tax;
 INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
-      VALUES ('1776','Umsatzsteuer 19 %', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', 0, 511,6);
+      VALUES ('1776','Umsatzsteuer 19 %', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice', 0, 511,6);
 INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
-      VALUES ('1576','Abziehbare Vorsteuer 19 %', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax', 0, 66,27);
+      VALUES ('1576','Abziehbare Vorsteuer 19 %', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', 0, 66,27);
 INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id from CHART WHERE accno='1776'), 0.19, '1776', 3, 'Umsatzsteuer 19%');
 INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id from CHART WHERE accno='1576'), 0.19, '1576', 9, 'Vorsteuer 19%');
 insert into taxkeys (chart_id, tax_id, taxkey_id, pos_ustva, startdate) select chart.id, (SELECT id from tax where taxdescription='Umsatzsteuer 19%'), 3, pos_ustva, '2007-01-01' from chart WHERE taxkey_id=3;

diff --git a/sql/Germany-DATEV-SKR04EU-chart.sql b/sql/Germany-DATEV-SKR04EU-chart.sql
index 1da0124..3bbf7ae 100644 (file)
--- a/sql/Germany-DATEV-SKR04EU-chart.sql
+++ b/sql/Germany-DATEV-SKR04EU-chart.sql
@@ -28,15 +28,15 @@ 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 ('1249', 'Pauschwertber. zu Forder. Restlzeit >1 Jahr',                              'A', 'E',         '',                                       '1249', 0,    NULL, 31,   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 ('1370', 'Durchlaufende Posten',                                                     'A', 'A',         '',                                       '1370', 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 ('1374', 'Fremdgeld',                                                                'A', 'A',         '',                                       '1374', 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 ('1401', 'Abziehbare Vorsteuer 7%',                                                  'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1401', 0,    66,   NULL, NULL, 27,   FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1401', 'Abziehbare Vorsteuer 7%',                                                  'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice', '1401', 0,    66,   NULL, NULL, 27,   FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1402', 'Abziehbare Vorsteuer aus innergemeinschftl. Erwerb',                       'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice',        '1402', 0,    61,   NULL, NULL, 27,   FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1403', 'Abziehbare Vorsteuer aus innergemeinschftl. Erwerb 16%',                   'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice',        '1403', 0,    61,   NULL, NULL, 27,   FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1404', 'Abziehbare Vorsteuer aus innergemeinschftl. Erwerb 19%',                   'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice',        '1403', 0,    61,   NULL, NULL, 27,   FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1405', 'Abziehbare Vorsteuer 16%',                                                 'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1405', 0,    66,   NULL, NULL, 27,   FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1406', 'Abziehbare Vorsteuer 19 %',                                                'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice:CT_tax', 0,      0,    66,   NULL, NULL, 27,   FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1407', 'Abziehbare Vorsteuer nach § 13b UStG 19%',                                 'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1407', 0,    NULL, NULL, NULL, 27,   FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1408', 'Abziehbare Vorsteuer nach § 13b UStG',                                     'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1408', 0,    NULL, NULL, NULL, 27,   FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1409', 'Abziehbare Vorsteuer nach § 13b UStG 16%',                                 'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1408', 0,    NULL, NULL, NULL, 27,   FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1405', 'Abziehbare Vorsteuer 16%',                                                 'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice', '1405', 0,    66,   NULL, NULL, 27,   FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1406', 'Abziehbare Vorsteuer 19 %',                                                'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice', 0,      0,    66,   NULL, NULL, 27,   FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1407', 'Abziehbare Vorsteuer nach § 13b UStG 19%',                                 'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice', '1407', 0,    NULL, NULL, NULL, 27,   FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1408', 'Abziehbare Vorsteuer nach § 13b UStG',                                     'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice', '1408', 0,    NULL, NULL, NULL, 27,   FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1409', 'Abziehbare Vorsteuer nach § 13b UStG 16%',                                 'A', 'E',         'AP_tax:IC_taxpart:IC_taxservice', '1408', 0,    NULL, NULL, NULL, 27,   FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1432', 'abziehb. VorSt EU-Erwerb Neufzg.b.Lief. o. USt-IdNr.',                     'A', 'E',         'AR_tax',                                 '1483', 0,    NULL, NULL, NULL, 27,   FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1433', 'Bezahlte Einfuhrumsatzsteuer',                                             'A', 'E',         '',                                       '1433', 0,    62,   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 ('1460', 'Geldtransit',                                                              'A', 'A',         '',                                       '1460', 0,    NULL, NULL, NULL, NULL, FALSE);
@@ -61,12 +61,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 ('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 ('3307', 'Verbindlk. aus LuL ohne Vorsteuer (EÜR)',                                  'A', 'L',         'AP',                                     '3307', 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 ('3309', 'Gegenkonto 3305-3307 bei Auteilung d. Forder. nach Steuersätzen (EÜR)',    'A', 'L',         '',                                       '3309', 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 ('3801', 'Umsatzsteuer 7%',                                                          'A', 'I',         'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '3801', 0,    NULL, NULL, NULL, 5,    FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3801', 'Umsatzsteuer 7%',                                                          'A', 'I',         'AR_tax:IC_taxpart:IC_taxservice', '3801', 0,    NULL, NULL, NULL, 5,    FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3802', 'Umsatzsteuer aus innergemeinschftl. Erwerb',                               'A', 'I',         'AR_tax:IC_taxpart:IC_taxservice',        '3802', 0,    NULL, NULL, NULL, 6,    FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3803', 'Umsatzsteuer aus innergemeinschftl. Erwerb 16%',                           'A', 'I',         'AR_tax:IC_taxpart:IC_taxservice',        '3803', 0,    NULL, NULL, NULL, 28,   FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3804', 'Umsatzsteuer aus innergemeinschftl. Erwerb 19%',                           'A', 'I',         'AR_tax:IC_taxpart:IC_taxservice',        '3803', 0,    NULL, NULL, NULL, 28,   FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3805', 'Umsatzsteuer 16%',                                                         'A', 'I',         'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '3805', 0,    NULL, NULL, NULL, 6,    FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3806', 'Umsatzsteuer 19%',                                                         'A', 'I',         'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '3805', 0,    511,  NULL, NULL, 6,    FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3805', 'Umsatzsteuer 16%',                                                         'A', 'I',         'AR_tax:IC_taxpart:IC_taxservice', '3805', 0,    NULL, NULL, NULL, 6,    FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3806', 'Umsatzsteuer 19%',                                                         'A', 'I',         'AR_tax:IC_taxpart:IC_taxservice', '3805', 0,    511,  NULL, NULL, 6,    FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3817', 'Umsatzsteuer aus in anderen EG-Land stpfl. Lieferungen',                   'A', ' ',         '',                                       '3817', 10,   NULL, 0,    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 ('3820', 'Umsatzsteuer-Vorauszahlungen',                                             'A', 'E',         '',                                       '3820', 0,    NULL, NULL, NULL, 28,   FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3830', 'Umsatzsteuer-Vorauszahlungen 1/11',                                        'A', 'E',         '',                                       '3830', 0,    NULL, NULL, NULL, 28,   FALSE);

diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl
index 766bd6b..c465ae9 100644 (file)
--- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl
+++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl
@@ -26,7 +26,7 @@ sub update_steuersaetze_skr03 {
   if (!$count) {
     $query =
       qq|INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
-      VALUES ('1776','Umsatzsteuer 19 %', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', 0, 511,6)|;
+      VALUES ('1776','Umsatzsteuer 19 %', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice', 0, 511,6)|;
     $dbh->do($query) || mydberror($query);
   }
   $query = "SELECT COUNT(*) FROM chart " .
@@ -36,7 +36,7 @@ sub update_steuersaetze_skr03 {
   if (!$count) {
     $query =
       qq|INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
-      VALUES ('1576','Abziehbare Vorsteuer 19 %', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax', 0, 66,27)|;
+      VALUES ('1576','Abziehbare Vorsteuer 19 %', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', 0, 66,27)|;
     $dbh->do($query) || mydberror($query);
   }
 
@@ -69,7 +69,7 @@ sub update_steuersaetze_skr04 {
   if (!$count) {
     $query =
       qq|INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
-      VALUES ('3806','Umsatzsteuer 19 %', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', 0, 511,6)|;
+      VALUES ('3806','Umsatzsteuer 19 %', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice', 0, 511,6)|;
     $dbh->do($query) || mydberror($query);
   }
   $query = "SELECT COUNT(*) FROM chart " .
@@ -79,7 +79,7 @@ sub update_steuersaetze_skr04 {
   if (!$count) {
     $query =
       qq|INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
-      VALUES ('1406','Abziehbare Vorsteuer 19 %', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax', 0, 66,27)|;
+      VALUES ('1406','Abziehbare Vorsteuer 19 %', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', 0, 66,27)|;
     $dbh->do($query) || mydberror($query);
   }
 

diff --git a/sql/Pg-upgrade2/ustva_setup_2007_update_chart_taxkeys_tax.sql b/sql/Pg-upgrade2/ustva_setup_2007_update_chart_taxkeys_tax.sql
index 56737e8..25fddff 100644 (file)
--- a/sql/Pg-upgrade2/ustva_setup_2007_update_chart_taxkeys_tax.sql
+++ b/sql/Pg-upgrade2/ustva_setup_2007_update_chart_taxkeys_tax.sql
@@ -18,7 +18,7 @@ INSERT INTO chart (
   )
 SELECT
   '1570','Anrechenbare Vorsteuer',
-  'A',         'E',       'AP_tax:IC_taxpart:IC_taxservice:CT_tax',
+  'A',         'E',       'AP_tax:IC_taxpart:IC_taxservice',
   0
 WHERE EXISTS ( -- update only for SKR03
     SELECT coa FROM defaults
@@ -33,7 +33,7 @@ INSERT INTO chart (
   )
 SELECT
   '1574','Abziehbare Vorsteuer aus innergem. Erwerb 19 %',
-  'A',         'E',       'AP_tax:IC_taxpart:IC_taxservice:CT_tax',
+  'A',         'E',       'AP_tax:IC_taxpart:IC_taxservice',
   0
 WHERE EXISTS ( -- update only for SKR03
     SELECT coa FROM defaults
@@ -48,7 +48,7 @@ INSERT INTO chart (
   )
 SELECT
   '1774','Umsatzsteuer aus innergem. Erwerb 19 %',
-  'A',         'I',       'AR_tax:IC_taxpart:IC_taxservice:CT_tax',
+  'A',         'I',       'AR_tax:IC_taxpart:IC_taxservice',
   0
 WHERE EXISTS ( -- update only for SKR03
     SELECT coa FROM defaults

diff --git a/sql/Swiss-German-chart.sql b/sql/Swiss-German-chart.sql
index 8de5b58..571c573 100644 (file)
--- a/sql/Swiss-German-chart.sql
+++ b/sql/Swiss-German-chart.sql
@@ -21,7 +21,7 @@ INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21205','Leasing','A','21200','L','AP');
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21210','Kurzfristige Finanzverbindlichkeiten','H','21000','L','');
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21220','Andere kurzfristige Verbindlichkeiten','H','21000','L','');
-INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21222','MWST (3,6)','A','21220','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice:CT_tax');
+INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21222','MWST (3,6)','A','21220','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice');
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21229','Gewinnausschüttung','A','21220','L','');
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21230','Passive Rechnungsabgrenzung, kurzfristige Rückstellungen','H','21000','L','');
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21235','Rückstellungen','A','21230','L','');
@@ -133,10 +133,10 @@ INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('36002','Reise (Fahrt)','A','36000','I','IC_income');
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('11117','MWST Vorsteuer auf Aufwand','A','11110','A','');
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21228','Geschuldete Steuern','A','21220','L','AP');
-INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21223','MWST (7,6)','A','21220','L','AR_tax:AP_tax:IC_taxpart:IC_expense:IC_taxservice:CT_tax');
+INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21223','MWST (7,6)','A','21220','L','AR_tax:AP_tax:IC_taxpart:IC_expense:IC_taxservice');
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('57001','AHV, IV, EO, ALV','A','57000','E','AP_amount:IC_income:IC_expense');
-INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21221','MWST (2,4)','A','21220','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice:CT_tax');
-INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21224','MWST (7.6) 1/2','A','21220','L','AR_tax:AP_tax:IC_taxpart:IC_expense:IC_taxservice:CT_tax');
+INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21221','MWST (2,4)','A','21220','L','AR_tax:AP_tax:IC_taxpart:IC_taxservice');
+INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21224','MWST (7.6) 1/2','A','21220','L','AR_tax:AP_tax:IC_taxpart:IC_expense:IC_taxservice');
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('66001','Werbeaufwand','A','66000','E','AP_amount:IC_expense');
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('21217','Privat','A','21210','L','AP');
 INSERT INTO chart (accno,description,charttype,gifi_accno,category,link) VALUES ('11101','Kasse','A','11100','A','AR_paid:AP_paid');