From: Wulf <wulf@coulmann.de>
Date: Mon, 9 Jan 2012 16:16:06 +0000 (+0100)
Subject:   Fix fuer Bug 1765
X-Git-Tag: release-2.7.0beta1~78^2~3
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c6a4a05a9ad2ae02;p=kivitendo-erp.git

  Fix fuer Bug 1765

  Dienstleistungen koennen nun auch Lieferanten haben.
---

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;