X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcp.pl;h=f91e9e00cb581f40acde81c239cf76db5d6274ec;hb=d5c1e4fa391f26fc0acd568729a98493edf319d8;hp=7eb702fada43b34d8f1cd31d4778978f3cd909fe;hpb=40782548cf82ac1e4c0fe417113a4cb3072e9390;p=kivitendo-erp.git diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl index 7eb702fad..f91e9e00c 100644 --- a/bin/mozilla/cp.pl +++ b/bin/mozilla/cp.pl @@ -36,7 +36,7 @@ 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; @@ -178,13 +178,13 @@ sub form_header { | if $form->{selectdepartment}; - $form->{jsscript} = $jscalendar; + $form->{jsscript} = 1; $jsscript = ""; if ($form->{jsscript}) { # with JavaScript Calendar $button1 = qq| - + text('button') . qq|> |; @@ -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,9 +306,9 @@ sub form_header { - | . $locale->text('Amount') . qq| - format_amount(\%myconfig, $form->{amount}, 2) . qq|> + | . $locale->text('Amount') . qq| + @@ -465,7 +467,6 @@ sub form_footer { {rowcount}> -{path}> {login}> {password}> @@ -673,7 +674,7 @@ sub print { $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}; @@ -694,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"; @@ -722,7 +725,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!')); @@ -744,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);