X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcp.pl;h=f91e9e00cb581f40acde81c239cf76db5d6274ec;hb=937a49378b241374fb29a7d52426507171dfbc2e;hp=6cde7f8971b23691ac45b897d50c6e83c84817f8;hpb=019c76b67a09a43062df0ee09a3b420f80c35c9d;p=kivitendo-erp.git diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl index 6cde7f897..f91e9e00c 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]; @@ -177,16 +178,15 @@ sub form_header { | if $form->{selectdepartment}; - $form->{jsscript} = $jscalendar; + $form->{jsscript} = 1; $jsscript = ""; if ($form->{jsscript}) { # with JavaScript Calendar $button1 = qq| - + text('button') - . qq|> + . $locale->text('button') . qq|> |; #write Trigger @@ -196,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}> @@ -304,10 +306,9 @@ sub form_header { - | . $locale->text('Amount') . qq| - format_amount(\%myconfig, $form->{amount}, 2) - . qq|> + | . $locale->text('Amount') . qq| + @@ -365,7 +366,8 @@ sub list_invoices { for $i (1 .. $form->{rowcount}) { map { - $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) + $form->{"${_}_$i"} = + $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(amount due paid); $totalamount += $form->{"amount_$i"}; @@ -444,12 +446,12 @@ sub form_footer { $media = qq|

@@ -604,11 +598,15 @@ 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 { - $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) + $form->{"${_}_$i"} = + $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(amount due paid); if ($form->{"checked_$i"}) { @@ -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,18 +670,18 @@ 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); - $form->{decimal} .= "00"; + #$form->{decimal} .= "00"; $form->{decimal} = substr($form->{decimal}, 0, 2); $check = new CP $myconfig{countrycode}; $check->init; $form->{text_amount} = $check->num2text($whole); - &{"$form->{vc}_details"}; + call_sub("$form->{vc}_details"); $form->{callback} = ""; @@ -692,11 +695,13 @@ sub print { $form->{pdf} = 1; } + delete $form->{OUT}; + if ($form->{media} eq 'printer') { $form->{OUT} = "| $myconfig{printer}"; } if ($form->{media} eq 'queue') { - %queued = split / /, $form->{queued}; + %queued = map { s|.*/|| } split / /, $form->{queued}; if ($filename = $queued{ $form->{formname} }) { unlink "$spool/$filename"; @@ -716,15 +721,11 @@ 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') { $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!')); @@ -746,6 +747,7 @@ sub check_form { exit; } + $form->error($locale->text('Zero amount posting!')) if !$form->parse_amount(\%myconfig, $form->{amount}); $form->error($locale->text('Date missing!')) unless $form->{datepaid}; $closedto = $form->datetonum($form->{closedto}, \%myconfig); @@ -758,7 +760,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"});