Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r41030 -r41117
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 41030)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 41117)
@@ -1959,7 +1959,9 @@
 								getTousseInstanceBarcode(tousseInstance, submitInvoiceContext), tousseInstance.getTousseName()));
 					}
 				}
-				if(!enableProxyDisinfectionToussesCustomInvoice && DatabaseUtil.isPoIdValid(tousseInstance.getProxyDisinfection_id())){
+				if(StringUtils.equals(submitInvoiceContext.getInvoiceType(), Invoice.TYPE_CUSTOM) 
+						&& !enableProxyDisinfectionToussesCustomInvoice 
+						&& DatabaseUtil.isPoIdValid(tousseInstance.getProxyDisinfection_id())){
 					notAllowInvoiceProxySterileTousseInstanceList.add(tousseInstance);
 				}
 			}