X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=sql%2FPg-upgrade2%2Fwarehouse.pl;h=6eebb2f7bdba6a52251909a7cb30f99564ec444b;hb=0d12df6dc721dcdbc81ca8db667cd644393bc5fc;hp=5fad058396f61af682ff687b036cdcd313d03ff2;hpb=5f0a5514943bce086319e6f02b31808874e680eb;p=kivitendo-erp.git

diff --git a/sql/Pg-upgrade2/warehouse.pl b/sql/Pg-upgrade2/warehouse.pl
index 5fad05839..6eebb2f7b 100644
--- a/sql/Pg-upgrade2/warehouse.pl
+++ b/sql/Pg-upgrade2/warehouse.pl
@@ -1,71 +1,26 @@
 # @tag: warehouse
 # @description:  Diverse neue Tabellen und Spalten zur Mehrlagerfähigkeit inkl. Migration
 # @depends: release_2_4_3
+package SL::DBUpgrade2::warehouse;
 
+use strict;
+use utf8;
 
-die("This script cannot be run from the command line.") unless ($main::form);
-$do_sql_migration = 0;
+use parent qw(SL::DBUpgrade2::Base);
 
-sub print_question {
-  print $main::form->parse_html_template("dbupgrade/warehouse_form");
-}
-
-sub do_update {
-  if (!$main::form->{do_migrate}
-      && (selectfirst_array_query($main::form, $dbh, $check_sql))[0]) { # check if update is needed
-    print_question();
-    return 2;
-  } else {
-    if ($main::form->{do_migrate} eq 'Y') {
-      # if yes, both warehouse and bin must be given
-      if (!$main::form->{import_warehouse} || !$main::form->{bin_default}) {
-        print_question();
-        return 2;
-      }
-      # flag for extra code
-      $do_sql_migration = 1;
-    }
-  }
-  my $warehouse = $main::form->{import_warehouse} ne '' ? $main::form->{import_warehouse} : "Transfer";
-  my $bin       = $main::form->{bin_default}      ne '' ? $main::form->{bin_default}      : "1";
+use SL::DBUtils;
 
-
-  my $migration_code = <<EOF
-
--- Warehouse anpassen
-INSERT INTO warehouse (description) VALUES ('$warehouse');
-
-UPDATE tmp_parts SET bin = NULL WHERE bin = '';
-
--- Warenbestand wiederherstellen
-INSERT INTO bin 
- (warehouse_id, description) 
- (SELECT DISTINCT warehouse.id, COALESCE(bin, '$bin') 
-   FROM warehouse, tmp_parts 
-   WHERE warehouse.description='$warehouse');
-INSERT INTO inventory 
- (warehouse_id, parts_id, bin_id, qty, employee_id, trans_id, trans_type_id)
- (SELECT warehouse.id, tmp_parts.id, bin.id, onhand, (SELECT id FROM employee LIMIT 1), nextval('id'), transfer_type.id 
-  FROM transfer_type, warehouse, tmp_parts, bin
-  WHERE warehouse.description = '$warehouse' 
-    AND COALESCE(bin, '$bin') = bin.description 
-    AND transfer_type.description = 'stock');
-EOF
-;
-
-  # do standard code
-  my $query  = $sqlcode;
-     $query .= $migration_code if $do_sql_migration;
-
-  do_query($main::form, $dbh, $query);
-
-  return 1;
+sub print_question {
+  print $::form->parse_html_template("dbupgrade/warehouse_form");
 }
 
+sub run {
+  my ($self)           = @_;
 
-
-$sqlcode = <<EOF
--- Tabelle "bin" für Lagerplätze.
+  my $do_sql_migration = 0;
+  my $check_sql        = qq|SELECT COUNT(id) FROM parts WHERE onhand > 0;|;
+  my $sqlcode          = <<SQL;
+-- Table "bin" for bins.
 CREATE TABLE bin (
   id integer NOT NULL DEFAULT nextval('id'),
   warehouse_id integer NOT NULL,
@@ -80,7 +35,7 @@ CREATE TABLE bin (
 CREATE TRIGGER mtime_bin BEFORE UPDATE ON bin
     FOR EACH ROW EXECUTE PROCEDURE set_mtime();
 
--- Tabelle "warehouse"
+-- Table "warehouse"
 ALTER TABLE warehouse ADD COLUMN sortkey integer;
 CREATE SEQUENCE tmp_counter;
 UPDATE warehouse SET sortkey = nextval('tmp_counter');
@@ -92,7 +47,7 @@ UPDATE warehouse SET invalid = 'f';
 CREATE TRIGGER mtime_warehouse BEFORE UPDATE ON warehouse
     FOR EACH ROW EXECUTE PROCEDURE set_mtime();
 
--- Tabelle "transfer_type"
+-- Table "transfer_type"
 CREATE TABLE transfer_type (
   id integer NOT NULL DEFAULT nextval('id'),
   direction varchar(10) NOT NULL,
@@ -118,7 +73,7 @@ INSERT INTO transfer_type (direction, description, sortkey) VALUES ('out', 'corr
 INSERT INTO transfer_type (direction, description, sortkey) VALUES ('transfer', 'transfer', 10);
 INSERT INTO transfer_type (direction, description, sortkey) VALUES ('transfer', 'correction', 11);
 
--- Anpassungen an "inventory".
+-- Modifications to "inventory".
 DELETE FROM inventory;
 
 ALTER TABLE inventory ADD COLUMN bin_id integer;
@@ -150,8 +105,7 @@ ALTER TABLE inventory ADD FOREIGN KEY (project_id) REFERENCES project (id);
 ALTER TABLE inventory ADD COLUMN chargenumber text;
 ALTER TABLE inventory ADD COLUMN comment text;
 
--- "onhand" in "parts" über einen Trigger automatisch berechnen lassen.
--- Vorher Warenbestand sichern JZ
+-- Let "onhand" in "parts" be calculated automatically by a trigger.
 SELECT id, onhand, bin INTO TEMP TABLE tmp_parts FROM parts WHERE onhand > 0;
 ALTER TABLE parts DROP COLUMN onhand;
 ALTER TABLE parts ADD COLUMN onhand numeric(25,5);
@@ -179,13 +133,59 @@ END;
 CREATE TRIGGER trig_update_onhand
   AFTER INSERT OR UPDATE OR DELETE ON inventory
   FOR EACH ROW EXECUTE PROCEDURE update_onhand();
-EOF
-;
+SQL
+
+  if (!$::form->{do_migrate}
+      && (selectfirst_array_query($::form, $self->dbh, $check_sql))[0]) { # check if update is needed
+    print_question();
+    return 2;
+  } else {
+    if (defined $::form->{do_migrate} && $::form->{do_migrate} eq 'Y') {
+      # if yes, both warehouse and bin must be given
+      if (!$::form->{import_warehouse} || !$::form->{bin_default}) {
+        print_question();
+        return 2;
+      }
+      # flag for extra code
+      $do_sql_migration = 1;
+    }
+  }
+  my $warehouse = defined $::form->{import_warehouse} && $::form->{import_warehouse} ne '' ? $::form->{import_warehouse} : "Transfer";
+  my $bin       = defined $::form->{bin_default}      && $::form->{bin_default}      ne '' ? $::form->{bin_default}      : "1";
 
+  $warehouse    = $self->dbh->quote($warehouse);
+  $bin          = $self->dbh->quote($bin);
 
-$check_sql = <<EOF
-SELECT COUNT(id) FROM parts WHERE onhand > 0;
+  my $migration_code = <<EOF
+
+-- Adjust warehouse
+INSERT INTO warehouse (description, sortkey, invalid) VALUES ($warehouse, 1, FALSE);
+
+UPDATE tmp_parts SET bin = NULL WHERE bin = '';
+
+-- Restore old onhand
+INSERT INTO bin
+ (warehouse_id, description)
+ (SELECT DISTINCT warehouse.id, COALESCE(bin, $bin)
+   FROM warehouse, tmp_parts
+   WHERE warehouse.description=$warehouse);
+INSERT INTO inventory
+ (warehouse_id, parts_id, bin_id, qty, employee_id, trans_id, trans_type_id, chargenumber)
+ (SELECT warehouse.id, tmp_parts.id, bin.id, onhand, (SELECT id FROM employee LIMIT 1), nextval('id'), transfer_type.id, ''
+  FROM transfer_type, warehouse, tmp_parts, bin
+  WHERE warehouse.description = $warehouse
+    AND COALESCE(bin, $bin) = bin.description
+    AND transfer_type.description = 'stock');
 EOF
 ;
 
-return do_update();
+  # do standard code
+  my $query  = $sqlcode;
+     $query .= $migration_code if $do_sql_migration;
+
+  $self->db_query($query);
+
+  return 1;
+}
+
+1;