X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_pay.pm;h=51c7b29e10f2a39fd9e127809d9e1bf167a57bb5;hb=b9940d4c9565a0e399b156d527f7426fe1cd098b;hp=00c6e1cfe7a68a1875811b13d581d856a9499dd2;hpb=ef5490483c6b97512c4a1fe0ec841c2044e346af;p=freeside.git

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 00c6e1cfe..51c7b29e1 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -61,6 +61,8 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item paybatch - text field for tracking card processing
 
+=item closed - books closed flag, empty or `Y'
+
 =back
 
 =head1 METHODS
@@ -179,11 +181,17 @@ sub upgrade_replace { #1.3.x->1.4.x
       '_date'  => $self->_date,
     };
     $error = $cust_bill_pay->insert;
-    if ( $error ) {
+    if ( $error =~ 
+           /total cust_bill_pay.amount and cust_credit_bill.amount .* for invnum .* greater than cust_bill.charged/ ) {
+      #warn $error;
+      my $cust_bill = qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
+      $new->custnum($cust_bill->custnum);
+    } elsif ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return $error;
+    } else {
+      $new->custnum($cust_bill_pay->cust_bill->custnum);
     }
-    $new->custnum($cust_bill_pay->cust_bill->custnum);
   } else {
     die;
   }
@@ -208,7 +216,9 @@ Currently unimplemented (accounting reasons).
 =cut
 
 sub delete {
-  return "Can't (yet?) delete cust_pay records!";
+  my $self = shift;
+  return "Can't delete closed payment" if $self->closed =~ /^Y/i;
+  $self->SUPER::delete(@_);
 }
 
 =item replace OLD_RECORD
@@ -237,10 +247,11 @@ sub check {
     || $self->ut_money('paid')
     || $self->ut_numbern('_date')
     || $self->ut_textn('paybatch')
+    || $self->ut_enum('closed', [ '', 'Y' ])
   ;
   return $error if $error;
 
-  return "paid must be > 0 " if $self->paid == 0;
+  return "paid must be > 0 " if $self->paid <= 0;
 
   return "unknown cust_main.custnum: ". $self->custnum
     unless $self->invnum
@@ -307,7 +318,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.12 2002-01-24 11:52:02 ivan Exp $
+$Id: cust_pay.pm,v 1.15 2002-01-29 16:33:15 ivan Exp $
 
 =head1 BUGS