Bug 21909: Make Koha::Account::outstanding_* preserve context

[srvgit] / Koha / Account.pm

diff --git a/Koha/Account.pm b/Koha/Account.pm
index 064489f..304d0e2 100644 (file)
--- a/Koha/Account.pm
+++ b/Koha/Account.pm
@@ -428,13 +428,12 @@ my $lines = Koha::Account->new({ patron_id => $patron_id })->outstanding_debits;
 sub outstanding_debits {
     my ($self) = @_;
 
-    my $lines = $self->lines->search(
+    return $self->lines->search(
         {
+            amount            => { '>' => 0 },
             amountoutstanding => { '>' => 0 }
         }
     );
-
-    return $lines;
 }
 
 =head3 outstanding_credits
@@ -446,13 +445,12 @@ my $lines = Koha::Account->new({ patron_id => $patron_id })->outstanding_credits
 sub outstanding_credits {
     my ($self) = @_;
 
-    my $lines = $self->lines->search(
+    return $self->lines->search(
         {
+            amount            => { '<' => 0 },
             amountoutstanding => { '<' => 0 }
         }
     );
-
-    return $lines;
 }
 
 =head3 non_issues_charges
@@ -515,15 +513,17 @@ sub lines {
     );
 }
 
-=head3 normalize_balance
+=head3 reconcile_balance
 
-$account->normalize_balance();
+$account->reconcile_balance();
 
-Find outstanding credits and use them to pay outstanding debits
+Find outstanding credits and use them to pay outstanding debits.
+Currently, this implicitly uses the 'First In First Out' rule for
+applying credits against debits.
 
 =cut
 
-sub normalize_balance {
+sub reconcile_balance {
     my ($self) = @_;
 
     my $outstanding_debits  = $self->outstanding_debits;