projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
part_export schema changes
[freeside.git]
/
FS
/
FS
/
cust_bill_pay.pm
diff --git
a/FS/FS/cust_bill_pay.pm
b/FS/FS/cust_bill_pay.pm
index
6d08b59
..
1c838b9
100644
(file)
--- a/
FS/FS/cust_bill_pay.pm
+++ b/
FS/FS/cust_bill_pay.pm
@@
-1,4
+1,4
@@
-package cust_bill_pay;
+package
FS::
cust_bill_pay;
use strict;
use vars qw( @ISA );
use strict;
use vars qw( @ISA );
@@
-95,7
+95,7
@@
sub insert {
$pay_total += $_ foreach map { $_->amount }
qsearch('cust_bill_pay', { 'paynum' => $self->paynum } );
$pay_total += $_ foreach map { $_->amount }
qsearch('cust_bill_pay', { 'paynum' => $self->paynum } );
- if (
$pay_total > $cust_pay->paid
) {
+ if (
sprintf("%.2f", $pay_total) > sprintf("%.2f", $cust_pay->paid)
) {
$dbh->rollback if $oldAutoCommit;
return "total cust_bill_pay.amount $pay_total for paynum ". $self->paynum.
" greater than cust_pay.paid ". $cust_pay->paid;
$dbh->rollback if $oldAutoCommit;
return "total cust_bill_pay.amount $pay_total for paynum ". $self->paynum.
" greater than cust_pay.paid ". $cust_pay->paid;
@@
-107,14
+107,14
@@
sub insert {
};
my $bill_total = 0;
};
my $bill_total = 0;
- $bill_total += foreach map { $_->amount }
+ $bill_total +=
$_
foreach map { $_->amount }
qsearch('cust_bill_pay', { 'invnum' => $self->invnum } );
qsearch('cust_bill_pay', { 'invnum' => $self->invnum } );
- $bill_total += foreach map { $_->amount }
+ $bill_total +=
$_
foreach map { $_->amount }
qsearch('cust_credit_bill', { 'invnum' => $self->invnum } );
qsearch('cust_credit_bill', { 'invnum' => $self->invnum } );
- if (
$bill_total > $cust_bill->charged
) {
+ if (
sprintf("%.2f", $bill_total) > sprintf("%.2f", $cust_bill->charged)
) {
$dbh->rollback if $oldAutoCommit;
return "total cust_bill_pay.amount and cust_credit_bill.amount $bill_total".
$dbh->rollback if $oldAutoCommit;
return "total cust_bill_pay.amount and cust_credit_bill.amount $bill_total".
- "for invnum ". $self->invnum.
+ "
for invnum ". $self->invnum.
" greater than cust_bill.charged ". $cust_bill->charged;
}
" greater than cust_bill.charged ". $cust_bill->charged;
}
@@
-156,14
+156,15
@@
sub check {
my $error =
$self->ut_numbern('billpaynum')
|| $self->ut_number('invnum')
my $error =
$self->ut_numbern('billpaynum')
|| $self->ut_number('invnum')
- || $self->ut_num
n
er('paynum')
+ || $self->ut_num
b
er('paynum')
|| $self->ut_money('amount')
|| $self->ut_numbern('_date')
;
return $error if $error;
|| $self->ut_money('amount')
|| $self->ut_numbern('_date')
;
return $error if $error;
-
$self->_date(time) unless $self->_date
;
+
return "amount must be > 0" if $self->amount <= 0
;
+ $self->_date(time) unless $self->_date;
''; #no error
}
''; #no error
}
@@
-176,14
+177,25
@@
Returns the payment (see L<FS::cust_pay>)
sub cust_pay {
my $self = shift;
sub cust_pay {
my $self = shift;
- qsearchs( 'cust_pay', { 'invnum' => $self->invnum } );
+ qsearchs( 'cust_pay', { 'paynum' => $self->paynum } );
+}
+
+=item cust_bill
+
+Returns the invoice (see L<FS::cust_bill>)
+
+=cut
+
+sub cust_bill {
+ my $self = shift;
+ qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
}
=back
=head1 VERSION
}
=back
=head1 VERSION
-$Id: cust_bill_pay.pm,v 1.
3 2001-09-02 01:27:11
ivan Exp $
+$Id: cust_bill_pay.pm,v 1.
11 2002-01-24 16:58:47
ivan Exp $
=head1 BUGS
=head1 BUGS