From c6a4a05a9ad2ae02dafff463fa7b49ce41d2ae2f Mon Sep 17 00:00:00 2001 From: Wulf Date: Mon, 9 Jan 2012 17:16:06 +0100 Subject: [PATCH] Fix fuer Bug 1765 Dienstleistungen koennen nun auch Lieferanten haben. --- SL/IC.pm | 2 -- bin/mozilla/invoice_io.pl | 11 +---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/SL/IC.pm b/SL/IC.pm index 8fd928167..5396c7add 100644 --- a/SL/IC.pm +++ b/SL/IC.pm @@ -497,7 +497,6 @@ sub save { } # insert makemodel records - unless ($form->{item} eq 'service') { my $lastupdate = ''; my $value = 0; for my $i (1 .. $form->{makemodel_rows}) { @@ -521,7 +520,6 @@ sub save { do_query($form, $dbh, $query, @values); } } - } # insert taxes foreach my $item (split(/ /, $form->{taxaccounts})) { diff --git a/bin/mozilla/invoice_io.pl b/bin/mozilla/invoice_io.pl index 42e402ec8..5f6c1414e 100644 --- a/bin/mozilla/invoice_io.pl +++ b/bin/mozilla/invoice_io.pl @@ -205,8 +205,7 @@ sub display_form { my $numrows = ++$form->{rowcount}; my $subroutine = "display_row"; - if ($form->{item} eq 'part') { - + if ($form->{item} =~ /(part|service)/) { #set preisgruppenanzahl $numrows = $form->{price_rows}; $subroutine = "price_row"; @@ -231,14 +230,6 @@ sub display_form { $numrows = ++$form->{assembly_rows}; $subroutine = "assembly_row"; } - if ($form->{item} eq 'service') { - $numrows = $form->{price_rows}; - $subroutine = "price_row"; - - &{$subroutine}($numrows); - - $numrows = 0; - } # create rows &{$subroutine}($numrows) if $numrows; -- 2.20.1