diff --git a/accounts/doctype/payable_voucher/payable_voucher.js b/accounts/doctype/payable_voucher/payable_voucher.js
index 4a566d373b..e3b986d8a1 100644
--- a/accounts/doctype/payable_voucher/payable_voucher.js
+++ b/accounts/doctype/payable_voucher/payable_voucher.js
@@ -20,12 +20,15 @@ cur_frm.cscript.onload = function(doc,dt,dn) {
   }  
   
   if(doc.__islocal){
-    if(doc.supplier) {cur_frm.cscript.supplier(doc,dt,dn)}
-    hide_field(['supplier_address','contact_person','supplier_name','address_display','contact_display','contact_mobile','contact_email']);
+    hide_field(['supplier_address', 'contact_person', 'supplier_name', 'address_display', 'contact_display', 'contact_mobile', 'contact_email']);
   }
-  
+}
 
-  if(doc.supplier) unhide_field(['supplier_address','contact_person','supplier_name','address_display','contact_display','contact_mobile','contact_email']);  
+
+//Onload post render
+//------------------------
+cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
+  if(doc.__islocal && doc.supplier) cur_frm.cscript.supplier(doc,dt,dn);
 }
 
 // Refresh
diff --git a/accounts/search_criteria/accounts_payable/accounts_payable.py b/accounts/search_criteria/accounts_payable/accounts_payable.py
index 8c07b68b45..44daddcf3c 100644
--- a/accounts/search_criteria/accounts_payable/accounts_payable.py
+++ b/accounts/search_criteria/accounts_payable/accounts_payable.py
@@ -90,9 +90,13 @@ for r in res:
 	# supplier type
 	r.append(supp_type_dict.get(r[col_idx['Account']], ''))	
 	
+	if r[col_idx['Voucher Type']] == 'Payable Voucher':
+		r += pv_dict.get(r[col_idx['Voucher No']], ['', '', ''])
+	else:
+		r += ['', '', '']
+	
 	# if entry against Payable Voucher
 	if r[col_idx['Against Voucher']] and r[col_idx['Voucher Type']] == 'Payable Voucher':
-		r += pv_dict.get(r[col_idx['Voucher No']], ['', '', ''])
 		cond = " and ifnull(against_voucher, '') = '%s'" % r[col_idx['Against Voucher']]
 
 	# if entry against JV & and not adjusted within period