X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIS.pm;h=e17efc6e6da991880d9056b1c6a3eb00682d2b55;hb=f8529382599e678ff266bd26ab82782e3d7b2686;hp=9b978217e831d9fc1b81031a9453090a15ffc927;hpb=0421095640741a61180e2df732d3a387b9c05ec9;p=kivitendo-erp.git diff --git a/SL/IS.pm b/SL/IS.pm index 9b978217e..e17efc6e6 100644 --- a/SL/IS.pm +++ b/SL/IS.pm @@ -34,8 +34,6 @@ package IS; -#use strict; - use List::Util qw(max); use SL::AM; @@ -49,6 +47,8 @@ use SL::MoreCommon; use SL::IC; use Data::Dumper; +use strict; + sub invoice_details { $main::lxdebug->enter_sub(); @@ -1976,12 +1976,10 @@ sub get_pricegroups_for_parts { $id = $form->{"id_$i"}; if (!($form->{"id_$i"}) and $form->{"new_id_$i"}) { - $id = $form->{"new_id_$i"}; } - my ($price, $selectedpricegroup_id) = split(/--/, - $form->{"sellprice_pg_$i"}); + my ($price, $selectedpricegroup_id) = split(/--/, $form->{"sellprice_pg_$i"}); my $pricegroup_old = $form->{"pricegroup_old_$i"}; $form->{"new_pricegroup_$i"} = $selectedpricegroup_id; @@ -2054,14 +2052,11 @@ sub get_pricegroups_for_parts { # if there is an exchange rate change price if (($form->{exchangerate} * 1) != 0) { - $pkr->{price} /= $form->{exchangerate}; } $pkr->{price} *= $form->{"basefactor_$i"}; - $pkr->{price} *= $basefactor; - $pkr->{price} = $form->format_amount($myconfig, $pkr->{price}, 5); if ($selectedpricegroup_id eq undef) {