X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=sql%2FPg-upgrade%2FPg-upgrade-2.2.0.33-2.2.0.34.pl;h=cc9a0f32252c2c99a3e63327472b5478a802c25d;hb=651e45595ce939cbfa0f9b349743b7f9f6a24e1e;hp=2a3dbe186b7bac11ae427f58b6953cac74d1a9cb;hpb=a1486b4ea62f731a7ce86b2b3f51983703dff2ad;p=kivitendo-erp.git

diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl
index 2a3dbe186..cc9a0f322 100644
--- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl
+++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl
@@ -162,18 +162,18 @@ sub update_known_buchungsgruppen {
   $sth->execute() || mydberror($query);
 
   my $query_update = "UPDATE parts SET buchungsgruppen_id = ?";
-  $query_update .= ", inventory_accno_id = ?" if ($main::eur);
+  $query_update .= ", inventory_accno_id = ?" if $::lx_office_conf{system}->{eur};
   $query_update .= " WHERE id = ?";
   my $sth_update = $dbh->prepare($query_update);
 
   while (my $ref = $sth->fetchrow_hashref()) {
     foreach my $bg (@{$buchungsgruppen}) {
-      if (($main::eur ||
+      if (($::lx_office_conf{system}->{eur} ||
            ($ref->{"inventory_accno_id"} == $bg->{"inventory_accno_id"})) &&
           ($ref->{"income_accno_id"} == $bg->{"income_accno_id_0"}) &&
           ($ref->{"expense_accno_id"} == $bg->{"expense_accno_id_0"})) {
         my @values = ($bg->{"id"}, $ref->{"id"});
-        splice(@values, 1, 0, $bg->{"inventory_accno_id"}) if ($main::eur);
+        splice(@values, 1, 0, $bg->{"inventory_accno_id"}) if $::lx_office_conf{system}->{eur};
         $sth_update->execute(@values) ||
           mydberror($query_update . " (" . join(", ", @values) . ")");
         last;
@@ -195,7 +195,7 @@ sub update_known_buchungsgruppen {
       if (($ref->{"income_accno_id"} == $bg->{"income_accno_id_0"}) &&
           ($ref->{"expense_accno_id"} == $bg->{"expense_accno_id_0"})) {
         my @values = ($bg->{"id"}, $ref->{"id"});
-        splice(@values, 1, 0, undef) if ($main::eur);
+        splice(@values, 1, 0, undef) if $::lx_office_conf{system}->{eur};
         $sth_update->execute(@values) ||
           mydberror($query_update . " (" . join(", ", @values) . ")");
         last;
@@ -299,17 +299,17 @@ sub display_create_bgs_dialog {
     $entry->{"ACC_INVENTORY"} = $acc_inventory;
     $entry->{"ACC_INCOME"} = $acc_income;
     $entry->{"ACC_EXPENSE"} = $acc_expense;
-    $entry->{"eur"} = $main::eur;
+    $entry->{"eur"} = $::lx_office_conf{system}->{eur};
   }
 
-  # $form->parse_html_template2("dbupgrade/buchungsgruppen_parts")
-  # $form->parse_html_template2("dbupgrade/buchungsgruppen_services")
-  # $form->parse_html_template2("dbupgrade/buchungsgruppen_assemblies")
+  # $form->parse_html_template("dbupgrade/buchungsgruppen_parts")
+  # $form->parse_html_template("dbupgrade/buchungsgruppen_services")
+  # $form->parse_html_template("dbupgrade/buchungsgruppen_assemblies")
 
-  print($form->parse_html_template2("dbupgrade/buchungsgruppen_${type}",
-                                    { "LIST" => $list,
-                                      "BUCHUNGSGRUPPEN" => $buchungsgruppen,
-                                    }));
+  print($form->parse_html_template("dbupgrade/buchungsgruppen_${type}",
+                                   { "LIST"            => $list,
+                                     "BUCHUNGSGRUPPEN" => $buchungsgruppen,
+                                   }));
 }
 
 sub create_buchungsgruppen {
@@ -399,7 +399,7 @@ sub retrieve_std_inventory_accno_id {
 
   my $inventory_accno_id;
   if ($inventory_accno) {
-    $query = "SELECT id FROM chart WHERE accno = $inventory_accno";
+    $query = "SELECT id FROM chart WHERE accno = '$inventory_accno'";
     ($inventory_accno_id) = $dbh->selectrow_array($query);
   }
 
@@ -439,7 +439,7 @@ sub do_update {
 
   # If balancing is off then force parts.inventory_accno_id to
   # a single value for parts.
-  force_inventory_accno_id_for_parts() if ($main::eur);
+  force_inventory_accno_id_for_parts() if $::lx_office_conf{system}->{eur};
 
   # Force "IC" to be present in chart.link for all accounts
   # which have been used as inventory accounts in parts.
@@ -459,7 +459,7 @@ sub do_update {
 
   my ($acc_inventory, $acc_income, $acc_expense) = retrieve_accounts();
 
-  print($form->parse_html_template2("dbupgrade/buchungsgruppen_header"));
+  print($form->parse_html_template("dbupgrade/buchungsgruppen_header"));
 
   if (scalar(@{$parts})) {
     display_create_bgs_dialog("parts", $parts,
@@ -467,7 +467,7 @@ sub do_update {
                               $buchungsgruppen);
     return 2;
   } else {
-    print($form->parse_html_template2("dbupgrade/buchungsgruppen_parts_done"));
+    print($form->parse_html_template("dbupgrade/buchungsgruppen_parts_done"));
   }
 
   if (scalar(@{$services})) {
@@ -476,7 +476,7 @@ sub do_update {
                               $buchungsgruppen);
     return 2;
   } else {
-    print($form->parse_html_template2("dbupgrade/buchungsgruppen_services_done"));
+    print($form->parse_html_template("dbupgrade/buchungsgruppen_services_done"));
   }
 
   if (scalar(@{$assemblies})) {
@@ -485,10 +485,10 @@ sub do_update {
                               $buchungsgruppen);
     return 2;
   } else {
-    print($form->parse_html_template2("dbupgrade/buchungsgruppen_assemblies_done"));
+    print($form->parse_html_template("dbupgrade/buchungsgruppen_assemblies_done"));
   }
 
-  print($form->parse_html_template2("dbupgrade/buchungsgruppen_footer"));
+  print($form->parse_html_template("dbupgrade/buchungsgruppen_footer"));
 
   return 1;
 }