Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r14043 -r14066 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14043) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14066) @@ -1494,8 +1494,12 @@ .equals(recyclingApplication.getType())) { TousseItem item = recyclingApplication.getApplicationItems().get(0); if (item != null) { - tousseDefinition = tousseDefinitionManager - .getTousseDefinitionByName(item.getTousseName()); + if(DatabaseUtil.isPoIdValid(item.getTousseDefinitionId())){ + tousseDefinition = tousseDefinitionManager.getTousseDefinitionById(item.getTousseDefinitionId()); + }else{ + tousseDefinition = tousseDefinitionManager + .getTousseDefinitionByName(item.getTousseName()); + } } } try { Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r14012 -r14066 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 14012) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 14066) @@ -480,6 +480,9 @@ List tousseItems = recyclingApplication .getApplicationItems(); if (tousseItems != null && tousseItems.size() > 0) { + if(DatabaseUtil.isPoIdValid(tousseItems.get(0).getTousseDefinitionId())){ + return tousseItems.get(0).getTousseDefinitionId().toString(); + } String tousseName = tousseItems.get(0).getTousseName(); TousseDefinition tousseDefinition = tousseDefinitionManager .getTousseDefinitionByName(tousseName);