-
- | $invoice |
-
+
+ | $invoice |
+
|;
$column_data{invnumber} =
@@ -357,7 +378,9 @@ sub list_invoices {
|;
- for $i (1 .. $form->{rowcount}) {
+ for my $i (1 .. $form->{rowcount}) {
+
+ my $j = 0;
map {
$form->{"${_}_$i"} =
@@ -394,7 +417,7 @@ sub list_invoices {
$j++;
$j %= 2;
print qq|
-
+
|;
map { print "$column_data{$_}\n" } @column_index;
print qq|
@@ -434,6 +457,10 @@ sub list_invoices {
sub form_footer {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
+ my ($media, $format, $latex_templates);
+
$form->{DF}{ $form->{format} } = "selected";
$form->{OP}{ $form->{media} } = "selected";
@@ -451,7 +478,7 @@ sub form_footer {
$format .= qq|
{rowcount}>
-{login}>
-{password}>
-
@@ -492,8 +516,12 @@ sub form_footer {
sub update {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
my ($new_name_selected) = @_;
+ my ($buysell, $newvc, $updated, $exchangerate, $amount);
+
if ($form->{vc} eq 'customer') {
$buysell = "buy";
} else {
@@ -553,13 +581,8 @@ sub update {
}
}
- $form->{exchangerate} = $exchangerate
- if (
- $form->{forex} = (
- $exchangerate =
- $form->check_exchangerate(
- \%myconfig, $form->{currency}, $form->{datepaid}, $buysell
- )));
+ $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{datepaid}, $buysell);
+ $form->{exchangerate} = $form->{forex} if $form->{forex};
$amount = $form->{amount} = $form->parse_amount(\%myconfig, $form->{amount});
@@ -568,8 +591,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};
@@ -596,7 +619,7 @@ sub update {
# Modified from $amount = $form->{amount} by J.Zach to update amount to total
# payment amount in Zahlungsausgang
$amount = 0;
- for $i (1 .. $form->{rowcount}) {
+ for my $i (1 .. $form->{rowcount}) {
map {
$form->{"${_}_$i"} =
@@ -611,7 +634,7 @@ sub update {
}
# Modified by J.Zach, see abovev
- $amount += $form->{"paid_$i"};
+ $amount += $form->{"paid_$i"};
} else {
$form->{"paid_$i"} = "";
@@ -625,7 +648,7 @@ sub update {
}
# Line added by J.Zach, see above
- $form->{amount}=$amount;
+ $form->{amount}=$amount;
&form_header;
&list_invoices;
@@ -637,6 +660,8 @@ sub update {
sub post {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
&check_form;
if ($form->{currency} ne $form->{defaultcurrency}) {
@@ -644,8 +669,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!')
@@ -662,6 +687,10 @@ sub post {
sub print {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
+ my ($whole, $check, %queued, $spool, $filename, $userspath);
+
&check_form;
($whole, $form->{decimal}) = split(/\./, $form->{amount});
@@ -675,7 +704,11 @@ sub print {
$check->init;
$form->{text_amount} = $check->num2text($whole);
- call_sub("$form->{vc}_details");
+ if ($form->{vc} eq 'customer') {
+ IS->customer_details(\%myconfig, $form);
+ } else {
+ IR->vendor_details(\%myconfig, $form);
+ }
$form->{callback} = "";
@@ -718,8 +751,7 @@ sub print {
$form->parse_template(\%myconfig, $userspath);
if ($form->{media} ne 'screen') {
- $form->{callback} =
- "$form->{script}?action=payment&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&all_vc=$form->{all_vc}";
+ $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&all_vc=$form->{all_vc}";
$form->redirect if (CP->process_payment(\%myconfig, \%$form));
$form->error($locale->text('Cannot post payment!'));
@@ -728,17 +760,18 @@ sub print {
$lxdebug->leave_sub();
}
-sub customer_details { IS->customer_details(\%myconfig, \%$form) }
-sub vendor_details { IR->vendor_details(\%myconfig, \%$form) }
-
sub check_form {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
+ my ($closedto, $datepaid, $amount);
+
&check_name($form->{vc});
if ($form->{currency} ne $form->{oldcurrency}) {
&update;
- exit;
+ ::end_of_request();
}
$form->error($locale->text('Zero amount posting!')) if !$form->parse_amount(\%myconfig, $form->{amount});
@@ -748,14 +781,14 @@ sub check_form {
$datepaid = $form->datetonum($form->{datepaid}, \%myconfig);
$form->error($locale->text('Cannot process payment for a closed period!'))
- if ($datepaid <= $closedto);
+ if ($form->date_closed($form->{"datepaid"}, \%myconfig));
$amount = $form->parse_amount(\%myconfig, $form->{amount});
$form->{amount} = $amount;
- for $i (1 .. $form->{rowcount}) {
+ for my $i (1 .. $form->{rowcount}) {
if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
- $amount -= $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"});
|