X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fcp.pl;h=f91e9e00cb581f40acde81c239cf76db5d6274ec;hb=2d6988532a665bd7e42bb88a38a8b52cbb352646;hp=5a1d2e3bc7f91257f303d6e6b66b70f9b1a2e95a;hpb=be4e11d36f40d90622fdf35eb07ab207422b5455;p=kivitendo-erp.git
diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index 5a1d2e3bc..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,7 +178,7 @@ sub form_header {
| if $form->{selectdepartment};
- $form->{jsscript} = $jscalendar;
+ $form->{jsscript} = 1;
$jsscript = "";
if ($form->{jsscript}) {
@@ -306,9 +306,9 @@ sub form_header {
|
- | . $locale->text('Amount') . qq| |
- format_amount(\%myconfig, $form->{amount}, 2) . qq| onBlur=\"check_right_number_format(this)\"> |
+ | . $locale->text('Amount') . qq| |
+ |
@@ -467,7 +467,6 @@ sub form_footer {
{rowcount}>
-{path}>
{login}>
{password}>
@@ -675,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};
@@ -696,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";
@@ -724,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!'));
@@ -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);