X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Finvoice_io.pl;h=5f6c1414e8ae0c058e95ad76907593e897668f1d;hb=648c78122b8e461afe12c840c639704f0fb33368;hp=97d30fec60256c3a08b672e99e7f9ad58a834e37;hpb=9bd3030a376850c427c102c6e0c54f19bd19332e;p=kivitendo-erp.git

diff --git a/bin/mozilla/invoice_io.pl b/bin/mozilla/invoice_io.pl
index 97d30fec6..5f6c1414e 100644
--- a/bin/mozilla/invoice_io.pl
+++ b/bin/mozilla/invoice_io.pl
@@ -34,7 +34,6 @@
 #######################################################################
 
 use CGI;
-use CGI::Ajax;
 use List::Util qw(max);
 
 use SL::Common;
@@ -47,7 +46,7 @@ use strict;
 
 # any custom scripts for this one
 if (-f "bin/mozilla/custom_invoice_io.pl") {
-  eval { require "bin/mozilla/custom_ivvoice_io.pl"; };
+  eval { require "bin/mozilla/custom_invoice_io.pl"; };
 }
 if (-f "bin/mozilla/$main::form->{login}_invoice_io.pl") {
   eval { require "bin/mozilla/$main::form->{login}_invoice_io.pl"; };
@@ -126,7 +125,8 @@ sub set_pricegroup {
         if ($item->{selected} && ($pricegroup_id != 0)) {
           $form->{"pricegroup_old_$j"} = $pricegroup_id;
           $form->{"price_new_$j"}      = $price;
-          $form->{"sellprice_$j"}      = $price;
+          # edit: don't change the sellprice here
+          # $form->{"sellprice_$j"}      = $price;   # this must only be updated for existing articles, not new ones
         }
         if ($pricegroup_id == 0) {
           $form->{"price_new_$j"} = $form->{"sellprice_$j"};
@@ -159,10 +159,10 @@ sub display_form {
   # if we have a display_form
   if ($form->{display_form}) {
     call_sub($form->{"display_form"});
-    exit;
+    ::end_of_request();
   }
 
-  Common::webdav_folder($form) if ($main::webdav);
+  Common::webdav_folder($form);
 
   #   if (   $form->{print_and_post}
   #       && $form->{second_run}
@@ -176,7 +176,7 @@ sub display_form {
   #     $form->{print_and_post} = 0;
   #
   #     &print_form($old_form);
-  #     exit;
+  #     ::end_of_request();
   #   }
   #
   #   $form->{action}   = "";
@@ -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;