X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcp.pl;h=2e58c8f833cad333b921c96cd5b7664d05596744;hb=1387c8c3ae668f43cafc8b81f51f7952b42db262;hp=8d7f6594321f756a7859991f620a5b48340a6d0f;hpb=89edb2eb5dec976b711d3d05303103176e8f4615;p=kivitendo-erp.git diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl index 8d7f65943..2e58c8f83 100644 --- a/bin/mozilla/cp.pl +++ b/bin/mozilla/cp.pl @@ -87,7 +87,7 @@ sub payment { } @{ $form->{PR}{ $form->{ARAP} } }; # currencies - @curr = split /:/, $form->{currencies}; + @curr = split(/:/, $form->{currencies}); chomp $curr[0]; $form->{defaultcurrency} = $form->{currency} = $form->{oldcurrency} = $curr[0]; @@ -483,14 +483,7 @@ sub form_footer { print qq| -|; - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - print qq| @@ -675,7 +668,7 @@ sub print { &check_form; - ($whole, $form->{decimal}) = split /\./, $form->{amount}; + ($whole, $form->{decimal}) = split(/\./, $form->{amount}); $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2); @@ -724,10 +717,6 @@ sub print { $form->{company} = $myconfig{company}; $form->{address} = $myconfig{address}; - @a = - qw(name invnumber company address text_amount street zipcode city country memo); - $form->format_string(@a); - $form->parse_template(\%myconfig, $userspath); if ($form->{media} ne 'screen') { @@ -766,7 +755,7 @@ sub check_form { $form->{amount} = $amount; for $i (1 .. $form->{rowcount}) { - if ($form->{"paid_$i"}) { + if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) { $amount -= $form->parse_amount($myconfig, $form->{"paid_$i"}); push(@{ $form->{paid} }, $form->{"paid_$i"});