-
- $invoice |
-
+
+ $invoice |
+
|;
$column_data{invnumber} =
@@ -409,7 +404,7 @@ sub list_invoices {
$j++;
$j %= 2;
print qq|
-
+
|;
map { print "$column_data{$_}\n" } @column_index;
print qq|
@@ -449,6 +444,8 @@ sub list_invoices {
sub form_footer {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
my ($media, $format, $latex_templates);
$form->{DF}{ $form->{format} } = "selected";
@@ -468,7 +465,7 @@ sub form_footer {
$format .= qq|
{rowcount}>
-{login}>
-{password}>
-
@@ -509,6 +503,8 @@ sub form_footer {
sub update {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
my ($new_name_selected) = @_;
my ($buysell, $newvc, $updated, $exchangerate, $amount);
@@ -572,13 +568,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});
@@ -630,7 +621,7 @@ sub update {
}
# Modified by J.Zach, see abovev
- $amount += $form->{"paid_$i"};
+ $amount += $form->{"paid_$i"};
} else {
$form->{"paid_$i"} = "";
@@ -644,7 +635,7 @@ sub update {
}
# Line added by J.Zach, see above
- $form->{amount}=$amount;
+ $form->{amount}=$amount;
&form_header;
&list_invoices;
@@ -656,6 +647,8 @@ sub update {
sub post {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
&check_form;
if ($form->{currency} ne $form->{defaultcurrency}) {
@@ -681,6 +674,8 @@ sub post {
sub print {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
my ($whole, $check, %queued, $spool, $filename, $userspath);
&check_form;
@@ -696,7 +691,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} = "";
@@ -739,8 +738,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!'));
@@ -749,12 +747,11 @@ 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});
@@ -771,7 +768,7 @@ 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;
|