X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=sql%2FPg-upgrade%2FPg-upgrade-2.2.0.28-2.2.0.29.pl;h=39b7f5482032a5214fdd7ad3350d594479df81a7;hb=d5440cc6f9cc5b2942458ce7480526e2b90b17a4;hp=209a6168a023295cf92ad81174818780cc299e60;hpb=9df5bd727acd137e086ee3bf5020868224797a71;p=kivitendo-erp.git

diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl
index 209a6168a..39b7f5482 100644
--- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl
+++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl
@@ -11,11 +11,36 @@ sub mydberror {
 sub myshowerror {
   my ($msg) = @_;
 
-  print($main::form->parse_html_template("dbupgrade/units_error",
-                                         { "message" => $msg }));
+  print($main::form->parse_html_template("dbupgrade/units_error", { "message" => $msg }));
   return 2;
 }
 
+sub fix_skr03 {
+  my $query;
+
+  $query =
+    "UPDATE chart " .
+    "SET link = 'AP_amount:IC_cogs', pos_ustva = 91 " .
+    "WHERE accno = '3559'";
+  $dbh->do($query) || mydberror($query);
+
+  $dbh->commit();
+  $dbh->begin_work();
+}
+
+sub fix_skr04 {
+  my $query;
+
+  $query =
+    "UPDATE chart " .
+    "SET link = 'AP_amount:IC_cogs', pos_ustva = 91 " .
+    "WHERE accno = '5559'";
+  $dbh->do($query) || mydberror($query);
+
+  $dbh->commit();
+  $dbh->begin_work();
+}
+
 sub create_standard_buchungsgruppen_skr03 {
   my $query;
 
@@ -33,28 +58,24 @@ sub create_standard_buchungsgruppen_skr03 {
       " income_accno_id_3, expense_accno_id_3) " .
       "VALUES " .
       "('Standard 16%', " .
-      ($main::eur ?
-       "(SELECT id FROM chart WHERE link = 'IC' " .
-       " ORDER BY id ASC LIMIT 1), "
-       :
-       # 3980: Bestand Waren
-       " (SELECT id FROM chart WHERE accno = '3980'), ") .
-       # 8400: Erlöse 16% USt.
-       # 3400: Wareneingang 16% Vorsteuer
-       " (SELECT id FROM chart WHERE accno = '8400'), " .
-       " (SELECT id FROM chart WHERE accno = '3400'), " .
-       # 8125: Steuerfrei innergem. Lieferungen §41bUStG
-       # 3550: Steuerfreier innergem.Erwerb
-       " (SELECT id FROM chart WHERE accno = '8125'), " .
-       " (SELECT id FROM chart WHERE accno = '3550'), " .
-       # 8400: Erlöse 16% USt.
-       # 3400: Wareneingang 16% Vorsteuer
-       " (SELECT id FROM chart WHERE accno = '8400'), " .
-       " (SELECT id FROM chart WHERE accno = '3400'), " .
-       # 8120: Steuerfreie Umsätze §4Nr.1a UstG
-       # 3550: Steuerfreier innergem.Erwerb
-       " (SELECT id FROM chart WHERE accno = '8120'), " .
-       " (SELECT id FROM chart WHERE accno = '3550'))";
+      # 3980: Bestand Waren
+      " (SELECT id FROM chart WHERE accno = '3980'), " .
+      # 8400: Erlöse 16% USt.
+      # 3400: Wareneingang 16% Vorsteuer
+      " (SELECT id FROM chart WHERE accno = '8400'), " .
+      " (SELECT id FROM chart WHERE accno = '3400'), " .
+      # 8320: Erlöse aus im and.EG-Land steuerpfl.Lieferungen
+      # 3550: Steuerfreier innergem.Erwerb
+      " (SELECT id FROM chart WHERE accno = '8320'), " .
+      " (SELECT id FROM chart WHERE accno = '3550'), " .
+      # 8315: Erlös Inland stpfl.EG-Lieferung 16%
+      # 3425: Innergem.Erwerb 16% VorSt u. Ust
+      " (SELECT id FROM chart WHERE accno = '8315'), " .
+      " (SELECT id FROM chart WHERE accno = '3425'), " .
+      # 8120: Steuerfreie Umsätze §4Nr.1a UstG
+      # 3559: Steuerfreie Einfuhren
+      " (SELECT id FROM chart WHERE accno = '8120'), " .
+      " (SELECT id FROM chart WHERE accno = '3559'))";
     $dbh->do($query) || mydberror($query);
   }
 
@@ -72,28 +93,24 @@ sub create_standard_buchungsgruppen_skr03 {
       " income_accno_id_3, expense_accno_id_3) " .
       "VALUES " .
       "('Standard 7%', " .
-      ($main::eur ?
-       "(SELECT id FROM chart WHERE link = 'IC' " .
-       " ORDER BY id ASC LIMIT 1), "
-       :
-       # 3980: Bestand Waren
-       " (SELECT id FROM chart WHERE accno = '3980'), ") .
-       # 8300: Erlöse 7% USt.
-       # 3300: Wareneingang 7% Vorsteuer
-       " (SELECT id FROM chart WHERE accno = '8300'), " .
-       " (SELECT id FROM chart WHERE accno = '3300'), " .
-       # 8125: Steuerfrei innergem. Lieferungen §41bUStG
-       # 3550: Steuerfreier innergem.Erwerb
-       " (SELECT id FROM chart WHERE accno = '8125'), " .
-       " (SELECT id FROM chart WHERE accno = '3550'), " .
-       # 8300: Erlöse 7% USt.
-       # 3420: Innergemein.Erwerb 7% VorSt u. Ust
-       " (SELECT id FROM chart WHERE accno = '8300'), " .
-       " (SELECT id FROM chart WHERE accno = '3420'), " .
-       # 8120: Steuerfreie Umsätze §4Nr.1a UstG
-       # 3300: Wareneingang 7% Vorsteuer
-       " (SELECT id FROM chart WHERE accno = '8120'), " .
-       " (SELECT id FROM chart WHERE accno = '3300'))";
+      # 3980: Bestand Waren
+      " (SELECT id FROM chart WHERE accno = '3980'), " .
+      # 8300: Erlöse 7% USt.
+      # 3300: Wareneingang 7% Vorsteuer
+      " (SELECT id FROM chart WHERE accno = '8300'), " .
+      " (SELECT id FROM chart WHERE accno = '3300'), " .
+      # 8125: Steuerfrei innergem. Lieferungen §41bUStG
+      # 3550: Steuerfreier innergem.Erwerb
+      " (SELECT id FROM chart WHERE accno = '8125'), " .
+      " (SELECT id FROM chart WHERE accno = '3550'), " .
+      # 8310: Erlöse Inland stpfl. EG-Lieferung7%
+      # 3420: Innergemein.Erwerb 7% VorSt u. Ust
+      " (SELECT id FROM chart WHERE accno = '8310'), " .
+      " (SELECT id FROM chart WHERE accno = '3420'), " .
+      # 8120: Steuerfreie Umsätze §4Nr.1a UstG
+      # 3559: Steuerfreie Einfuhren
+      " (SELECT id FROM chart WHERE accno = '8120'), " .
+      " (SELECT id FROM chart WHERE accno = '3559'))";
     $dbh->do($query) || mydberror($query);
   }
 
@@ -117,28 +134,24 @@ sub create_standard_buchungsgruppen_skr04 {
       " income_accno_id_3, expense_accno_id_3) " .
       "VALUES " .
       "('Standard 16%', " .
-      ($main::eur ?
-       "(SELECT id FROM chart WHERE link = 'IC' " .
-       " ORDER BY id ASC LIMIT 1), "
-       :
-       # 1140: Bestand Waren
-       " (SELECT id FROM chart WHERE accno = '1140'), ") .
-       # 4400: Erlöse 16% USt.
-       # 5400: Wareneingang 16% Vorsteuer
-       " (SELECT id FROM chart WHERE accno = '4400'), " .
-       " (SELECT id FROM chart WHERE accno = '5400'), " .
-       # 4125: Steuerfrei innergem. Lieferungen §41bUStG
-       # 5550: Steuerfreier innergem.Erwerb
-       " (SELECT id FROM chart WHERE accno = '4125'), " .
-       " (SELECT id FROM chart WHERE accno = '5550'), " .
-       # 4315: Erlös Inland stpfl.EG-Lieferung 16%
-       # 5425: Innergem.Erwerb 16% VorSt u. Ust
-       " (SELECT id FROM chart WHERE accno = '4315'), " .
-       " (SELECT id FROM chart WHERE accno = '5425'), " .
-       # 4150: Sonstige steuerfreie Umsätze §42-7UStG
-       # 5550: Steuerfreier innergem.Erwerb
-       " (SELECT id FROM chart WHERE accno = '4150'), " .
-       " (SELECT id FROM chart WHERE accno = '5550'))";
+      # 1140: Bestand Waren
+      " (SELECT id FROM chart WHERE accno = '1140'), " .
+      # 4400: Erlöse 16% USt.
+      # 5400: Wareneingang 16% Vorsteuer
+      " (SELECT id FROM chart WHERE accno = '4400'), " .
+      " (SELECT id FROM chart WHERE accno = '5400'), " .
+      # 4125: Steuerfrei innergem. Lieferungen §41bUStG
+      # 5550: Steuerfreier innergem.Erwerb
+      " (SELECT id FROM chart WHERE accno = '4125'), " .
+      " (SELECT id FROM chart WHERE accno = '5550'), " .
+      # 4315: Erlös Inland stpfl.EG-Lieferung 16%
+      # 5425: Innergem.Erwerb 16% VorSt u. Ust
+      " (SELECT id FROM chart WHERE accno = '4315'), " .
+      " (SELECT id FROM chart WHERE accno = '5425'), " .
+      # 4150: Sonstige steuerfreie Umsätze §42-7UStG
+      # 5559: Steuerfreie Einfuhren
+      " (SELECT id FROM chart WHERE accno = '4150'), " .
+      " (SELECT id FROM chart WHERE accno = '5559'))";
     $dbh->do($query) || mydberror($query);
   }
 
@@ -156,28 +169,24 @@ sub create_standard_buchungsgruppen_skr04 {
       " income_accno_id_3, expense_accno_id_3) " .
       "VALUES " .
       "('Standard 7%', " .
-      ($main::eur ?
-       "(SELECT id FROM chart WHERE link = 'IC' " .
-       " ORDER BY id ASC LIMIT 1), "
-       :
-       # 1140: Bestand Waren
-       " (SELECT id FROM chart WHERE accno = '1140'), ") .
-       # 4300: Erlöse 7%USt
-       # 5300: Wareneingang 7% Vorsteuer
-       " (SELECT id FROM chart WHERE accno = '4300'), " .
-       " (SELECT id FROM chart WHERE accno = '5300'), " .
-       # 4125: Steuerfrei innergem. Lieferungen §41bUStG
-       # 5550: Steuerfreier innergem.Erwerb
-       " (SELECT id FROM chart WHERE accno = '4125'), " .
-       " (SELECT id FROM chart WHERE accno = '5550'), " .
-       # 4310: Erlöse Inland stpfl. EG-Lieferung7%
-       # 5420: Innergemein.Erwerb 7% VorSt u. Ust
-       " (SELECT id FROM chart WHERE accno = '4310'), " .
-       " (SELECT id FROM chart WHERE accno = '5420'), " .
-       # 4150: Sonstige steuerfreie Umsätze §42-7UStG
-       # 5550: Steuerfreier innergem.Erwerb
-       " (SELECT id FROM chart WHERE accno = '4150'), " .
-       " (SELECT id FROM chart WHERE accno = '5550'))";
+      # 1140: Bestand Waren
+      " (SELECT id FROM chart WHERE accno = '1140'), " .
+      # 4300: Erlöse 7%USt
+      # 5300: Wareneingang 7% Vorsteuer
+      " (SELECT id FROM chart WHERE accno = '4300'), " .
+      " (SELECT id FROM chart WHERE accno = '5300'), " .
+      # 4125: Steuerfrei innergem. Lieferungen §41bUStG
+      # 5550: Steuerfreier innergem.Erwerb
+      " (SELECT id FROM chart WHERE accno = '4125'), " .
+      " (SELECT id FROM chart WHERE accno = '5550'), " .
+      # 4310: Erlöse Inland stpfl. EG-Lieferung7%
+      # 5420: Innergemein.Erwerb 7% VorSt u. Ust
+      " (SELECT id FROM chart WHERE accno = '4310'), " .
+      " (SELECT id FROM chart WHERE accno = '5420'), " .
+      # 4150: Sonstige steuerfreie Umsätze §42-7UStG
+      # 5559; Steuerfreie Einfuhren
+      " (SELECT id FROM chart WHERE accno = '4150'), " .
+      " (SELECT id FROM chart WHERE accno = '5559'))";
     $dbh->do($query) || mydberror($query);
   }
 
@@ -191,14 +200,15 @@ sub create_standard_buchungsgruppen {
   my ($coa) = $dbh->selectrow_array($query);
 
   if ($coa eq "Germany-DATEV-SKR03EU") {
+    fix_skr03();
     return create_standard_buchungsgruppen_skr03();
+
   } elsif ($coa eq "Germany-DATEV-SKR04EU") {
+    fix_skr04();
     return create_standard_buchungsgruppen_skr04();
   }
 
-  print($form->parse_html_template("dbupgrade/" .
-                                   "std_buchungsgruppen_unknown_coa",
-                                   { "coa" => $coa }));
+  print($form->parse_html_template("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa }));
 
   return 1;
 }