X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FIC.pm;h=d458862ea93af548ce46fe044f9137a723e3be77;hb=0c28bb82b805b07543debaf08061b58d0b437c07;hp=f39c169b299411b8b1eb52cfa78778d4e91de8a3;hpb=4486e3bc8eb00c37cf8029e663eb94b4b9c5346a;p=kivitendo-erp.git diff --git a/SL/IC.pm b/SL/IC.pm index f39c169b2..d458862ea 100644 --- a/SL/IC.pm +++ b/SL/IC.pm @@ -156,18 +156,6 @@ SQL } $trq->finish; - # now get accno for taxes - $query = - qq|SELECT c.accno - FROM chart c, partstax pt - WHERE (pt.chart_id = c.id) AND (pt.parts_id = ?)|; - $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id})); - while (my ($key) = $sth->fetchrow_array) { - $form->{amount}{$key} = $key; - } - - $sth->finish; - # is it an orphan my @referencing_tables = qw(invoice orderitems inventory rmaitems); my %column_map = ( ); @@ -295,9 +283,6 @@ sub save { do_query($form, $dbh, qq|DELETE FROM assembly WHERE id = ?|, conv_i($form->{id})); } - # delete tax records - do_query($form, $dbh, qq|DELETE FROM partstax WHERE parts_id = ?|, conv_i($form->{id})); - # delete translations do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id})); @@ -321,7 +306,7 @@ sub save { $form->{orphaned} = 1; } - my $partsgroup_id = 0; + my $partsgroup_id = undef; if ($form->{partsgroup}) { (my $partsgroup, $partsgroup_id) = split(/--/, $form->{partsgroup}); @@ -470,17 +455,6 @@ sub save { } } - # insert taxes - foreach my $item (split(/ /, $form->{taxaccounts})) { - if ($form->{"IC_tax_$item"}) { - $query = - qq|INSERT INTO partstax (parts_id, chart_id) - VALUES (?, (SELECT id FROM chart WHERE accno = ?))|; - @values = (conv_i($form->{id}), $item); - do_query($form, $dbh, $query, @values); - } - } - # add assembly records if ($form->{item} eq 'assembly') { @@ -617,7 +591,7 @@ sub delete { my %columns = ( "assembly" => "id", "parts" => "id" ); - for my $table (qw(prices partstax makemodel inventory assembly translation parts)) { + for my $table (qw(prices makemodel inventory assembly translation parts)) { my $column = defined($columns{$table}) ? $columns{$table} : "parts_id"; do_query($form, $dbh, qq|DELETE FROM $table WHERE $column = ?|, @values); }