schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: handle shareholder option in payment entry

Browse Source
This commit is contained in:
Mangesh-Khairnar
2019-07-12 16:28:03 +05:30
committed by GitHub
parent ae3c21046b
commit ceaedd0f95
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@@ -558,7 +558,7 @@ def get_outstanding_reference_documents(args):
# Get negative outstanding sales /purchase invoices # Get negative outstanding sales /purchase invoices
negative_outstanding_invoices = [] negative_outstanding_invoices = []
if args.get("party_type") not in ["Student", "Employee", "Shareholder"] and not args.get("voucher_no"): if args.get("party_type") in ("Supplier", "Customer") and not args.get("voucher_no"):
negative_outstanding_invoices = get_negative_outstanding_invoices(args.get("party_type"), negative_outstanding_invoices = get_negative_outstanding_invoices(args.get("party_type"),
args.get("party"), args.get("party_account"), party_account_currency, company_currency) args.get("party"), args.get("party_account"), party_account_currency, company_currency)
@@ -589,7 +589,7 @@ def get_outstanding_reference_documents(args):
# Get all SO / PO which are not fully billed or aginst which full advance not paid # Get all SO / PO which are not fully billed or aginst which full advance not paid
orders_to_be_billed = [] orders_to_be_billed = []
if (args.get("party_type") != "Student"): if (args.get("party_type") in ("Supplier", "Customer")):
orders_to_be_billed = get_orders_to_be_billed(args.get("posting_date"),args.get("party_type"), orders_to_be_billed = get_orders_to_be_billed(args.get("posting_date"),args.get("party_type"),
args.get("party"), party_account_currency, company_currency) args.get("party"), party_account_currency, company_currency)
@@ -601,8 +601,6 @@ def get_orders_to_be_billed(posting_date, party_type, party, party_account_curre
voucher_type = 'Sales Order' voucher_type = 'Sales Order'
elif party_type == "Supplier": elif party_type == "Supplier":
voucher_type = 'Purchase Order' voucher_type = 'Purchase Order'
elif party_type == "Employee":
voucher_type = None
else: else:
voucher_type = None voucher_type = None