X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fcp.pl;h=5ced174723eac6c3d7f9abc5874b440efd3cce18;hb=ccd0b365250f57021a756203f65a4d153709b45d;hp=4decb86c3adf5c038de209f478cc4f63db58f9c1;hpb=ee072e4f077213bf6f8792ca8f0a1afebbb6282f;p=kivitendo-erp.git
diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index 4decb86c3..5ced17472 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -36,7 +36,13 @@ use SL::OP;
use SL::IS;
use SL::IR;
-require "$form->{path}/arap.pl";
+use strict ("vars", "subs");
+#use warnings;
+
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
+
+our ($form, %myconfig, $lxdebug, $locale);
1;
@@ -45,6 +51,8 @@ require "$form->{path}/arap.pl";
sub payment {
$lxdebug->enter_sub();
+ my (@curr);
+
$form->{ARAP} = ($form->{type} eq 'receipt') ? "AR" : "AP";
$form->{arap} = lc $form->{ARAP};
@@ -87,7 +95,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];
@@ -106,6 +114,9 @@ sub payment {
sub form_header {
$lxdebug->enter_sub();
+ my ($vc, $vclabel, $allvc, $arap, $department, $exchangerate);
+ my ($jsscript, $button1, $button2, $onload);
+
$vclabel = ucfirst $form->{vc};
$vclabel = $locale->text($vclabel);
@@ -145,7 +156,7 @@ sub form_header {
}
}
- foreach $item ($form->{vc}, account, currency, $form->{ARAP}, department) {
+ foreach my $item ($form->{vc}, "account", "currency", $form->{ARAP}, "department") {
$form->{"select$item"} =~ s/ selected//;
$form->{"select$item"} =~
s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
@@ -177,35 +188,35 @@ 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
$jsscript =
- Form->write_trigger(\%myconfig, "1", "datepaid", "BL", "trigger1", "",
- "", "");
+ Form->write_trigger(\%myconfig, "1", "datepaid", "BL", "trigger1");
} else {
# 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|
-
+
@@ -507,6 +511,8 @@ sub update {
my ($new_name_selected) = @_;
+ my ($buysell, $newvc, $updated, $exchangerate, $amount);
+
if ($form->{vc} eq 'customer') {
$buysell = "buy";
} else {
@@ -581,8 +587,8 @@ sub update {
$form->{queued} = "";
- $i = 0;
- foreach $ref (@{ $form->{PR} }) {
+ my $i = 0;
+ foreach my $ref (@{ $form->{PR} }) {
$i++;
$form->{"id_$i"} = $ref->{id};
$form->{"invnumber_$i"} = $ref->{invnumber};
@@ -605,11 +611,15 @@ sub update {
}
# recalculate
- $amount = $form->{amount};
- for $i (1 .. $form->{rowcount}) {
+
+ # Modified from $amount = $form->{amount} by J.Zach to update amount to total
+ # payment amount in Zahlungsausgang
+ $amount = 0;
+ for my $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"}) {
@@ -619,7 +629,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"} = "";
}
@@ -631,6 +643,9 @@ sub update {
}
+ # Line added by J.Zach, see above
+ $form->{amount}=$amount;
+
&form_header;
&list_invoices;
&form_footer;
@@ -648,8 +663,8 @@ sub post {
unless $form->{exchangerate};
}
- $msg1 = "$form->{origtitle} posted!";
- $msg2 = "Cannot post $form->{origtitle}!";
+ my $msg1 = "$form->{origtitle} posted!";
+ my $msg2 = "Cannot post $form->{origtitle}!";
# $locale->text('Payment posted!')
# $locale->text('Receipt posted!')
@@ -666,20 +681,22 @@ sub post {
sub print {
$lxdebug->enter_sub();
+ my ($whole, $check, %queued, $spool, $filename, $userspath);
+
&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} = "";
@@ -693,11 +710,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";
@@ -717,15 +736,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!'));
@@ -740,6 +755,8 @@ sub vendor_details { IR->vendor_details(\%myconfig, \%$form) }
sub check_form {
$lxdebug->enter_sub();
+ my ($closedto, $datepaid, $amount);
+
&check_name($form->{vc});
if ($form->{currency} ne $form->{oldcurrency}) {
@@ -747,6 +764,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,9 +776,9 @@ sub check_form {
$amount = $form->parse_amount(\%myconfig, $form->{amount});
$form->{amount} = $amount;
- for $i (1 .. $form->{rowcount}) {
- if ($form->{"paid_$i"}) {
- $amount -= $form->parse_amount($myconfig, $form->{"paid_$i"});
+ for my $i (1 .. $form->{rowcount}) {
+ if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
+ $amount -= $form->parse_amount(\%myconfig, $form->{"paid_$i"});
push(@{ $form->{paid} }, $form->{"paid_$i"});
push(@{ $form->{due} }, $form->{"due_$i"});