Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[kivitendo-erp.git] / sql / Pg-upgrade / Pg-upgrade-2.2.0.27-2.2.0.28.pl

diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl
index 4731867..60b4631 100644 (file)
--- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl
+++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl
@@ -11,8 +11,7 @@ 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;
 }
 
@@ -49,7 +48,6 @@ sub update_guess_chart_of_accounts {
   my $form = $main::form;
 
   my @valid_coas = map({ s/^sql\///; s/-chart.sql//; $_; } <sql/*-chart.sql>);
-  $main::lxdebug->dump(0, "mufti", \@valid_coas);
 
   my $query = "SELECT coa FROM defaults";
   my ($coa) = $dbh->selectrow_array($query);
@@ -57,13 +55,13 @@ sub update_guess_chart_of_accounts {
   return 1 if (grep({ $coa eq $_ } @valid_coas));
 
   return update_defaults_set_coa("Germany-DATEV-SKR04EU")
-    if (look_for_accno("0135"));
+    if (look_for_accno("6595"));
 
   return update_defaults_set_coa("Germany-DATEV-SKR03EU")
-    if (look_for_accno("0027"));
+    if (look_for_accno("2725"));
 
   return update_defaults_set_coa("Austria")
-    if (look_for_accno("0625"));
+    if (look_for_accno("2701"));
 
   return update_defaults_set_coa("France")
     if (look_for_accno("131800"));
@@ -77,8 +75,7 @@ sub update_guess_chart_of_accounts {
 
   my @coas = map(+{ "name" => $_ }, @valid_coas);
 
-  print($form->parse_html_template("dbupgrade/coa_guess",
-                                   { "COAS" => \@coas }));
+  print($form->parse_html_template("dbupgrade/coa_guess", { "COAS" => \@coas }));
 
   return 2;
 }