X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcp.pl;h=b68865a4fc0ed377996baa641548d22249b98531;hb=599030d5e26bcef0f9850ddbbedba106ded70ebb;hp=a80e8e176a6d3278e370fb4872e8b48481f39b57;hpb=54e4131e091831e00a861fe2c4f53e344b87ddca;p=kivitendo-erp.git diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl index a80e8e176..b68865a4f 100644 --- a/bin/mozilla/cp.pl +++ b/bin/mozilla/cp.pl @@ -36,7 +36,8 @@ use SL::OP; use SL::IS; use SL::IR; -require "$form->{path}/arap.pl"; +require "bin/mozilla/arap.pl"; +require "bin/mozilla/common.pl"; 1; @@ -87,7 +88,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]; @@ -183,7 +184,7 @@ sub form_header { # with JavaScript Calendar $button1 = qq| - + text('button') . qq|> |; @@ -195,15 +196,17 @@ sub form_header { # without JavaScript Calendar $button1 = qq| - |; + |; } - + $form->{javascript} .= qq||; $form->header; $arap = lc $form->{ARAP}; - + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; print qq| - +
{script}> @@ -305,7 +308,7 @@ sub form_header { | . $locale->text('Amount') . qq| format_amount(\%myconfig, $form->{amount}, 2) . qq|> + . $form->format_amount(\%myconfig, $form->{amount}, 2) . qq| onBlur=\"check_right_number_format(this)\"> @@ -464,7 +467,6 @@ sub form_footer { {rowcount}> -{path}> {login}> {password}> @@ -483,14 +485,7 @@ sub form_footer { print qq| -|; - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - print qq|
@@ -603,7 +598,10 @@ sub update { } # recalculate - $amount = $form->{amount}; + + # Modified from $amount = $form->{amount} by J.Zach to update amount to total + # payment amount in Zahlungsausgang + $amount = 0; for $i (1 .. $form->{rowcount}) { map { @@ -618,7 +616,9 @@ sub update { $form->{"paid_$i"} = $form->{"due_$i"}; } - $amount -= $form->{"paid_$i"}; + # Modified by J.Zach, see abovev + $amount += $form->{"paid_$i"}; + } else { $form->{"paid_$i"} = ""; } @@ -630,6 +630,9 @@ sub update { } + # Line added by J.Zach, see above + $form->{amount}=$amount; + &form_header; &list_invoices; &form_footer; @@ -667,7 +670,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); @@ -678,7 +681,7 @@ sub print { $check->init; $form->{text_amount} = $check->num2text($whole); - &{"$form->{vc}_details"}; + call_sub("$form->{vc}_details"); $form->{callback} = ""; @@ -720,7 +723,7 @@ sub print { if ($form->{media} ne 'screen') { $form->{callback} = - "$form->{script}?action=payment&vc=$form->{vc}&path=$form->{path}&login=$form->{login}&password=$form->{password}&all_vc=$form->{all_vc}"; + "$form->{script}?action=payment&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&all_vc=$form->{all_vc}"; $form->redirect if (CP->process_payment(\%myconfig, \%$form)); $form->error($locale->text('Cannot post payment!')); @@ -754,7 +757,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"});