Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r14564 -r14568 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 14564) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 14568) @@ -3289,8 +3289,9 @@ materialsMD5Set.addAll(materialsMD5List); } sql = String - .format(" where %s and (%s and po.tousseFixedBarcode=false and %s )", + .format(" where %s and %s and (%s and po.tousseFixedBarcode=false and %s )", SqlUtils.getStringFieldPredicate("po.status", TousseInstance.STATUS_DISINFECTED), + getValidUntilPredicate(dateQueryAdapter, "po.validUntil"), SqlUtils.getStringFieldPredicate("po.tousseName", tousseDefinitionName), SqlUtils.getStringFieldInCollectionsPredicate(