Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16634 -r16640 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16634) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16640) @@ -2467,6 +2467,7 @@ if(CollectionUtils.isNotEmpty(scanedBarcodes)){ hql += " and " + SqlUtils.getStringFieldNotInCollectionsPredicate("po.barcode", scanedBarcodes); } + hql += " and po.location='" + AcegiHelper.getCurrentOrgUnitCode() + "'"; hql += " and " + SqlUtils.getStringFieldInCollectionsPredicate("po.status", acceptStatus); hql += " and po.validUntil > " + dateQueryAdapter.dateAdapter(startDate); hql += " and po.validUntil < " + dateQueryAdapter.dateAdapter(endDate);