X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_bill_pay.pm;h=913704befc970e24f5d1ec1a69174c471727b220;hb=c0567c688084e89fcd11bf82348b6c418f1254ac;hp=921c0255ca33585d1ffc9ed633a7ee150a2c6500;hpb=dbfb0ae501d5acba37f9348476d94b99a4c92450;p=freeside.git

diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index 921c0255c..913704bef 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -95,7 +95,7 @@ sub insert {
   $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;
@@ -111,10 +111,10 @@ sub insert {
     qsearch('cust_bill_pay', { 'invnum' => $self->invnum } );
   $bill_total += $_ foreach map { $_->amount } 
     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".
-           "for invnum ". $self->invnum.
+           " for invnum ". $self->invnum.
            " greater than cust_bill.charged ". $cust_bill->charged;
   }
 
@@ -125,12 +125,16 @@ sub insert {
 
 =item delete
 
-Currently unimplemented (accounting reasons).
+Deletes this payment application, unless the closed flag for the parent payment
+(see L<FS::cust_pay>) is set.
 
 =cut
 
 sub delete {
-  return "Can't (yet?) delete cust_bill_pay records!";
+  my $self = shift;
+  return "Can't delete application for closed payment"
+    if $self->cust_pay->closed =~ /^Y/i;
+  $self->SUPER::delete(@_);
 }
 
 =item replace OLD_RECORD
@@ -162,7 +166,7 @@ sub check {
   ;
   return $error if $error;
 
-  return "amount must be > 0" if $self->amount == 0;
+  return "amount must be > 0" if $self->amount <= 0;
 
   $self->_date(time) unless $self->_date;
 
@@ -195,7 +199,7 @@ sub cust_bill {
 
 =head1 VERSION
 
-$Id: cust_bill_pay.pm,v 1.7 2001-09-02 07:49:52 ivan Exp $
+$Id: cust_bill_pay.pm,v 1.12 2002-02-07 22:29:34 ivan Exp $
 
 =head1 BUGS