projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
638a282
)
calculate in_transit_payments correctly for partially complete batches, #37193
author
Mark Wells
<mark@freeside.biz>
Tue, 27 Oct 2015 00:40:56 +0000
(17:40 -0700)
committer
Mark Wells
<mark@freeside.biz>
Tue, 27 Oct 2015 00:41:24 +0000
(17:41 -0700)
FS/FS/cust_main.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
c7f40f2
..
5691d83
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-2564,7
+2564,13
@@
sub batch_card {
}else{
$amount = sprintf("%.2f", $self->balance - $self->in_transit_payments);
}
}else{
$amount = sprintf("%.2f", $self->balance - $self->in_transit_payments);
}
- return '' unless $amount > 0;
+ if ($amount <= 0) {
+ warn(sprintf("Customer balance %.2f - in transit amount %.2f is <= 0.\n",
+ $self->balance,
+ $self->in_transit_payments
+ ));
+ return;
+ }
my $invnum = delete $options{invnum};
my $payby = $options{payby} || $self->payby; #still dubious
my $invnum = delete $options{invnum};
my $payby = $options{payby} || $self->payby; #still dubious
@@
-2974,6
+2980,7
@@
sub in_transit_payments {
foreach my $cust_pay_batch ( qsearch('cust_pay_batch', {
'batchnum' => $pay_batch->batchnum,
'custnum' => $self->custnum,
foreach my $cust_pay_batch ( qsearch('cust_pay_batch', {
'batchnum' => $pay_batch->batchnum,
'custnum' => $self->custnum,
+ 'status' => '',
} ) ) {
$in_transit_payments += $cust_pay_batch->amount;
}
} ) ) {
$in_transit_payments += $cust_pay_batch->amount;
}