diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 6cec259d0b8..862a033cf3c 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -558,7 +558,7 @@ def get_outstanding_reference_documents(args):
 
 	# Get negative outstanding sales /purchase invoices
 	negative_outstanding_invoices = []
-	if args.get("party_type") not in ["Student", "Employee"] and not args.get("voucher_no"):
+	if args.get("party_type") not in ["Student", "Employee", "Shareholder"] and not args.get("voucher_no"):
 		negative_outstanding_invoices = get_negative_outstanding_invoices(args.get("party_type"),
 			args.get("party"), args.get("party_account"), party_account_currency, company_currency)
 
@@ -603,6 +603,8 @@ def get_orders_to_be_billed(posting_date, party_type, party, party_account_curre
 		voucher_type = 'Purchase Order'
 	elif party_type == "Employee":
 		voucher_type = None
+	else:
+		voucher_type = None
 
 	# Add cost center condition
 	if voucher_type: