diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInvoiceWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInvoiceWindow.java
index 6ac4a2ab44..e64a9daa47 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInvoiceWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInvoiceWindow.java
@@ -59,6 +59,17 @@ public class InfoInvoiceWindow extends InfoWindow {
 			isSOTrx = "Y";
 		}
 		
+		//Set Defaults
+        String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID");
+        if (!Util.isEmpty(bp)) {
+        	for (WEditor editor : editors) {
+				if (editor.getGridField() != null && editor.getGridField().getColumnName().equals("C_BPartner_ID")) {
+					editor.setValue(new Integer(bp));
+					break;
+				}
+			}
+        }
+        
 		if (!Util.isEmpty(isSOTrx)) {
 			for (WEditor editor : editors) {
 				if (editor.getGridField() != null && editor.getGridField().getColumnName().equals("IsSOTrx")) {