X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=sql%2FPg-upgrade%2FPg-upgrade-2.2.0.25-2.2.0.26.pl;h=e51b3a8a5e72c8f617cd4b956ab339f807e71bc9;hb=03b964b2afb0c72dd54688e08a6dda47a1bdfee9;hp=1d7f9a1d64d4308e78d091abcf46a6e8e29e6122;hpb=3d6e7124dcbe401fe578d777f952f74055a68fd4;p=kivitendo-erp.git

diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl
index 1d7f9a1d6..e51b3a8a5 100644
--- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl
+++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl
@@ -1,15 +1,11 @@
 #!/usr/bin/perl
 
-die("This script cannot be run from the command line.") unless ($main::form);
-
-use SL::AM;
+# Datenbankupgrade: Einfuehrung von Einheiten
 
-%dbup_myconfig = ();
-map({ $dbup_myconfig{$_} = $main::form->{$_}; }
-    qw(dbname dbuser dbpasswd dbhost dbport dbconnect));
+die("This script cannot be run from the command line.") unless ($main::form);
 
 sub mydberror {
-  my ($dbup_locale, $msg) = @_;
+  my ($msg) = @_;
   die($dbup_locale->text("Database update error:") .
       "<br>$msg<br>" . $DBI::errstr);
 }
@@ -22,19 +18,86 @@ sub myshowerror {
   return 2;
 }
 
-sub update_units_add_unit {
-  my ($dbup_locale, $dbh) = @_;
+sub get_base_unit {
+  my ($units, $unit_name, $factor) = @_;
+
+  $factor = 1 unless ($factor);
+
+  my $unit = $units->{$unit_name};
+
+  if (!defined($unit) || !$unit->{"base_unit"} ||
+      ($unit_name eq $unit->{"base_unit"})) {
+    return ($unit_name, $factor);
+  }
+
+  return get_base_unit($units, $unit->{"base_unit"}, $factor * $unit->{"factor"});
+}
 
+sub retrieve_units {
+  my ($myconfig, $form, $type, $prefix) = @_;
+
+  my $query = "SELECT *, base_unit AS original_base_unit FROM units";
+  my @values;
+  if ($type) {
+    $query .= " WHERE (type = ?)";
+    @values = ($type);
+  }
+
+  my $sth = $dbh->prepare($query);
+  $sth->execute(@values) || $form->dberror($query . " (" . join(", ", @values) . ")");
+
+  my $units = {};
+  while (my $ref = $sth->fetchrow_hashref()) {
+    $units->{$ref->{"name"}} = $ref;
+  }
+  $sth->finish();
+
+  my $query_lang = "SELECT id, template_code FROM language ORDER BY description";
+  $sth = $dbh->prepare($query_lang);
+  $sth->execute() || $form->dberror($query_lang);
+  my @languages;
+  while ($ref = $sth->fetchrow_hashref()) {
+    push(@languages, $ref);
+  }
+  $sth->finish();
+
+  foreach my $unit (values(%{$units})) {
+    ($unit->{"${prefix}base_unit"}, $unit->{"${prefix}factor"}) = get_base_unit($units, $unit->{"name"});
+  }
+
+  return $units;
+}
+
+sub unit_select_data {
+  my ($units, $selected, $empty_entry) = @_;
+
+  my $select = [];
+
+  if ($empty_entry) {
+    push(@{$select}, { "name" => "", "base_unit" => "", "factor" => "", "selected" => "" });
+  }
+
+  foreach my $unit (sort({ lc($a) cmp lc($b) } keys(%{$units}))) {
+    push(@{$select}, { "name" => $unit,
+                       "base_unit" => $units->{$unit}->{"base_unit"},
+                       "factor" => $units->{$unit}->{"factor"},
+                       "selected" => ($unit eq $selected) ? "selected" : "" });
+  }
+
+  return $select;
+}
+
+sub update_units_add_unit {
   my $form = $main::form;
 
   return 0 unless ($form->{"new_name"});
 
   return myshowerror($dbup_locale->text("The name is missing."))
     if ($form->{"new_name"} eq "");
-  my $units = AM->retrieve_units(\%dbup_myconfig, $form);
+  my $units = retrieve_units(\%dbup_myconfig, $form);
   return myshowerror($dbup_locale->text("A unit with this name does already exist."))
     if ($units->{$form->{"new_name"}});
-  $units = AM->retrieve_units(\%dbup_myconfig, $form, $form->{"unit_type"});
+  $units = retrieve_units(\%dbup_myconfig, $form, $form->{"unit_type"});
 
   my ($base_unit, $factor);
   if ($form->{"new_base_unit"}) {
@@ -54,7 +117,7 @@ sub update_units_add_unit {
     "VALUES (?, ?, ?, ?)";
   $dbh->do($query, undef, $form->{"new_name"}, $base_unit, $factor,
            $form->{"unit_type"}) ||
-    mydberror($dbup_locale, $query .
+    mydberror($query .
               " ($form->{new_name}, $base_unit, $factor, $form->{unit_type})");
   $dbh->commit();
   $dbh->begin_work();
@@ -65,8 +128,6 @@ sub update_units_add_unit {
 }
 
 sub update_units_assign_units {
-  my ($dbup_locale, $dbh) = @_;
-
   my ($query, $sth, @values);
 
   my $form = $main::form;
@@ -79,7 +140,7 @@ sub update_units_assign_units {
       next unless ($form->{"new_unit_$i"} && $form->{"old_unit_$i"});
       @values = ($form->{"new_unit_$i"}, lc($form->{"old_unit_$i"}));
       $sth->execute(@values) ||
-        mydberror($dbup_locale, $query . " (" . join(", ", @values) . ")");
+        mydberror($query . " (" . join(", ", @values) . ")");
     }
   }
 
@@ -89,16 +150,19 @@ sub update_units_assign_units {
 }
 
 sub update_units_assign_known {
-  my ($dbup_locale, $dbh) = @_;
-
   my $form = $main::form;
 
   my %unit_name_mapping = (
     "st" => "Stck",
     "st." => "Stck",
+    "stk" => "Stck",
     "pc" => "Stck",
     "pcs" => "Stck",
     "ea" => "Stck",
+
+    "h" => "Std",
+    "stunde" => "Std",
+    "tage" => "Tag",
     );
 
   my $i = 1;
@@ -109,12 +173,10 @@ sub update_units_assign_known {
   }
   $form->{"rowcount"} = scalar(keys(%unit_name_mapping));
 
-  update_units_assign_units($dbup_locale, $dbh);
+  update_units_assign_units();
 }
 
 sub update_units_steps_1_2 {
-  my ($dbup_locale, $dbh) = @_;
-
   my (%unknown_dimension_units, %unknown_service_units);
 
   my $form = $main::form;
@@ -123,22 +185,22 @@ sub update_units_steps_1_2 {
     my ($query, $sth, $ref);
 
     if ($table eq "parts") {
-      $query = "SELECT unit, inventory_accno_id FROM parts " .
+      $query = "SELECT unit, inventory_accno_id, assembly FROM parts " .
         "WHERE NOT ((unit = '') OR unit ISNULL OR " .
         "           unit IN (SELECT name FROM units))";
 
     } else {
-      $query = "SELECT t.unit, p.inventory_accno_id " .
+      $query = "SELECT t.unit, p.inventory_accno_id, p.assembly " .
         "FROM $table t " .
         "LEFT JOIN parts p ON p.id = t.parts_id " .
         "WHERE NOT ((t.unit = '') OR t.unit ISNULL OR " .
         "           t.unit IN (SELECT name FROM units))";
     }
     $sth = $dbh->prepare($query);
-    $sth->execute() || mydberror($dbup_locale, $query);
+    $sth->execute() || mydberror($query);
 
     while ($ref = $sth->fetchrow_hashref()) {
-      if ($ref->{"inventory_accno_id"}) {
+      if ($ref->{"inventory_accno_id"} || $ref->{"assembly"}) {
         $unknown_dimension_units{$ref->{"unit"}} = 1;
 
       } else {
@@ -150,8 +212,8 @@ sub update_units_steps_1_2 {
   }
 
   if (scalar(keys(%unknown_dimension_units)) != 0) {
-    my $units = AM->retrieve_units(\%dbup_myconfig, $form, "dimension");
-    my $ddbox = AM->unit_select_data($units, undef, 1);
+    my $units = retrieve_units(\%dbup_myconfig, $form, "dimension");
+    my $ddbox = unit_select_data($units, undef, 1);
 
     my @unknown_parts;
     map({ push(@unknown_parts, { "name" => $_, "NEW_UNITS" => $ddbox }); }
@@ -169,8 +231,8 @@ sub update_units_steps_1_2 {
   }
 
   if (scalar(keys(%unknown_service_units)) != 0) {
-    my $units = AM->retrieve_units(\%dbup_myconfig, $form, "service");
-    my $ddbox = AM->unit_select_data($units, undef, 1);
+    my $units = retrieve_units(\%dbup_myconfig, $form, "service");
+    my $ddbox = unit_select_data($units, undef, 1);
 
     my @unknown_services;
     map({ push(@unknown_services, { "name" => $_, "NEW_UNITS" => $ddbox }); }
@@ -191,8 +253,6 @@ sub update_units_steps_1_2 {
 }
 
 sub update_units_step_3 {
-  my ($dbup_locale, $dbh) = @_;
-
   my $form = $main::form;
 
   my $query = "SELECT ";
@@ -204,12 +264,12 @@ sub update_units_step_3 {
   my ($has_unassigned) = $dbh->selectrow_array($query);
 
   if ($has_unassigned) {
-    my $dimension_units = AM->retrieve_units(\%dbup_myconfig, $form,
+    my $dimension_units = retrieve_units(\%dbup_myconfig, $form,
                                              "dimension");
-    my $dimension_ddbox = AM->unit_select_data($dimension_units);
+    my $dimension_ddbox = unit_select_data($dimension_units);
 
-    my $service_units = AM->retrieve_units(\%dbup_myconfig, $form, "service");
-    my $service_ddbox = AM->unit_select_data($service_units);
+    my $service_units = retrieve_units(\%dbup_myconfig, $form, "service");
+    my $service_ddbox = unit_select_data($service_units);
 
     print($form->parse_html_template("dbupgrade/units_set_default",
                                      { "DIMENSION_DDBOX" => $dimension_ddbox,
@@ -223,8 +283,6 @@ sub update_units_step_3 {
 }
 
 sub update_units_set_default {
-  my ($dbup_locale, $dbh) = @_;
-
   my $form = $main::form;
 
   foreach my $table (qw(parts invoice orderitems rmaitems)) {
@@ -236,62 +294,62 @@ sub update_units_set_default {
     if ($table eq "parts") {
       $query = "UPDATE $table SET unit = " .
         $dbh->quote($form->{"default_dimension_unit"}) . " " .
-        "WHERE ((unit ISNULL) OR (unit = '')) AND (inventory_accno_id > 0)";
+        "WHERE ((unit ISNULL) OR (unit = '')) AND " .
+        "(assembly OR (inventory_accno_id > 0))";
     } else {
       $query = "UPDATE $table SET unit = " .
         $dbh->quote($form->{"default_dimension_unit"}) . " " .
         "WHERE ((unit ISNULL) OR (unit = '')) AND " .
-        "parts_id IN (SELECT id FROM parts WHERE (inventory_accno_id > 0))";
+        "parts_id IN (SELECT id FROM parts WHERE " .
+        "(assembly OR (inventory_accno_id > 0)))";
     }
 
-    $dbh->do($query) || mydberror($dbup_locale, $query);
+    $dbh->do($query) || mydberror($query);
 
     if ($table eq "parts") {
       $query = "UPDATE $table SET unit = " .
         $dbh->quote($form->{"default_service_unit"}) . " " .
         "WHERE ((unit ISNULL) OR (unit = '')) AND " .
-        "(inventory_accno_id ISNULL) OR (inventory_accno_id = 0)";
+        "((inventory_accno_id ISNULL) OR (inventory_accno_id = 0)) AND " .
+        "NOT assembly";
     } else {
       $query = "UPDATE $table SET unit = " .
         $dbh->quote($form->{"default_service_unit"}) . " " .
         "WHERE ((unit ISNULL) OR (unit = '')) AND " .
         "parts_id IN (SELECT id FROM parts " .
-        "WHERE (inventory_accno_id ISNULL) OR (inventory_accno_id = 0))";
+        "WHERE ((inventory_accno_id ISNULL) OR (inventory_accno_id = 0)) " .
+        "AND NOT assembly)";
     }
 
-    $dbh->do($query) || mydberror($dbup_locale, $query);
+    $dbh->do($query) || mydberror($query);
   }
 }
 
 sub update_units {
-  my (@dbh) = @_;
-
   my $form = $main::form;
 
   my $res;
 
-  my $dbup_locale = Locale->new($main::language, "dbupgrade");
-
   print($form->parse_html_template("dbupgrade/units_header"));
 
   if ($form->{"action2"} eq "add_unit") {
-    $res = update_units_add_unit($dbup_locale, $dbh);
+    $res = update_units_add_unit();
     return $res if ($res);
 
   } elsif ($form->{"action2"} eq "assign_units") {
-    update_units_assign_units($dbup_locale, $dbh);
+    update_units_assign_units();
 
   } elsif ($form->{"action2"} eq "set_default") {
-    update_units_set_default($dbup_locale, $dbh);
+    update_units_set_default();
 
   }
 
-  update_units_assign_known($dbup_locale, $dbh);
+  update_units_assign_known();
 
-  $res = update_units_steps_1_2($dbup_locale, $dbh);
+  $res = update_units_steps_1_2();
   return $res if ($res);
 
-  return update_units_step_3($dbup_locale, $dbh);
+  return update_units_step_3();
 }
 
-update_units($dbh);
+update_units();