killbill-uncached

invoice: Fix computation of unpaid invoice to also filter for

1/28/2016 7:02:01 PM

Details

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceDaoHelper.java b/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceDaoHelper.java
index e80ffa1..acf13dc 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceDaoHelper.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceDaoHelper.java
@@ -178,7 +178,7 @@ public class InvoiceDaoHelper {
             public boolean apply(final InvoiceModelDao in) {
                 final BigDecimal balance = InvoiceModelDaoHelper.getBalance(in);
                 log.debug("Computed balance={} for invoice={}", balance, in);
-                return (balance.compareTo(BigDecimal.ZERO) >= 1) && (upToDate == null || !in.getTargetDate().isAfter(upToDate));
+                return (!in.isWrittenOff() && balance.compareTo(BigDecimal.ZERO) >= 1) && (upToDate == null || !in.getTargetDate().isAfter(upToDate));
             }
         });
         return new ArrayList<InvoiceModelDao>(unpaidInvoices);