From: Niclas Zimmermann Date: Tue, 5 Mar 2013 15:37:33 +0000 (+0100) Subject: Veralteter Code X-Git-Tag: release-3.1.0beta1~568 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=37ffd321a8511ad03a0ce80bfe5680481767f0e6;p=kivitendo-erp.git Veralteter Code Dieser Commit entfernt die Tabellen rma und rmaitems. Beide werden schon seit längerer Zeit nicht mehr aktualisiert und wurden vor dem Commit nur noch an 2 Stellen ausgelesen. --- diff --git a/SL/IC.pm b/SL/IC.pm index d458862ea..4b48dcc4f 100644 --- a/SL/IC.pm +++ b/SL/IC.pm @@ -157,7 +157,7 @@ SQL $trq->finish; # is it an orphan - my @referencing_tables = qw(invoice orderitems inventory rmaitems); + my @referencing_tables = qw(invoice orderitems inventory); my %column_map = ( ); my $parts_id = conv_i($form->{id}); diff --git a/SL/PE.pm b/SL/PE.pm index 9906a72d9..28f3ba5c1 100644 --- a/SL/PE.pm +++ b/SL/PE.pm @@ -172,7 +172,7 @@ sub pricegroups { my $first = 1; $where .= qq| AND id NOT IN (|; - foreach my $table (qw(invoice orderitems prices rmaitems)) { + foreach my $table (qw(invoice orderitems prices)) { $where .= "UNION " unless ($first); $first = 0; $where .= @@ -253,7 +253,7 @@ sub get_pricegroup { my @values = (); $query = qq|SELECT |; - foreach my $table (qw(invoice orderitems prices rmaitems)) { + foreach my $table (qw(invoice orderitems prices)) { $query .= " + " unless ($first); $first = 0; $query .= qq|(SELECT COUNT(*) FROM $table WHERE pricegroup_id = ?) |; diff --git a/sql/Pg-upgrade2/drop_rma.sql b/sql/Pg-upgrade2/drop_rma.sql new file mode 100644 index 000000000..548532aec --- /dev/null +++ b/sql/Pg-upgrade2/drop_rma.sql @@ -0,0 +1,7 @@ +-- @tag: drop_rma +-- @description: Löscht nicht mehr benötigte Tabellen rma und rma_items +-- @depends: release_3_0_0 +-- @charset: utf-8 + +DROP TABLE rma; +DROP TABLE rmaitems;