[report][enhancement] Payment period based on invoice date: show party columns and filter based on party

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -458,11 +458,11 @@ def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None):
 	if voucher_type=="Bank Entry":
 		account = frappe.db.get_value("Company", company, "default_bank_account")
 		if not account:
-			account = frappe.db.get_value("Account", {"company": company, "account_type": "Bank"})
+			account = frappe.db.get_value("Account", {"company": company, "account_type": "Bank", "is_group": 0})
 	elif voucher_type=="Cash Entry":
 		account = frappe.db.get_value("Company", company, "default_cash_account")
 		if not account:
-			account = frappe.db.get_value("Account", {"company": company, "account_type": "Cash"})
+			account = frappe.db.get_value("Account", {"company": company, "account_type": "Cash", "is_group": 0})
 
 	if account:
 		return {

erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js

@@ -3,6 +3,14 @@
 
 frappe.query_reports["Payment Period Based On Invoice Date"] = {
 	"filters": [
+		{
+			fieldname:"company",
+			label: __("Company"),
+			fieldtype: "Link",
+			options: "Company",
+			reqd: 1,
+			default: frappe.defaults.get_user_default("company")
+		},
 		{
 			fieldname: "from_date",
 			label: __("From Date"),
@@ -23,27 +31,28 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
 			default: "Incoming"
 		},
 		{
-			fieldname:"account",
+			"fieldname":"party_type",
-			label: __("Account"),
+			"label": __("Party Type"),
-			fieldtype: "Link",
+			"fieldtype": "Link",
-			options: "Account",
+			"options": "DocType",
-			get_query: function() {
+			"get_query": function() {
 				return {
-					query: "erpnext.controllers.queries.get_account_list",
+					filters: {"name": ["in", ["Customer", "Supplier"]]}
-					filters: {
-						"report_type": "Balance Sheet",
-						company: frappe.query_report.filters_by_name.company.get_value()
-					}
 				}
 			}
 		},
 		{
-			fieldname:"company",
+			"fieldname":"party",
-			label: __("Company"),
+			"label": __("Party"),
-			fieldtype: "Link",
+			"fieldtype": "Dynamic Link",
-			options: "Company",
+			"get_options": function() {
-			reqd: 1,
+				var party_type = frappe.query_report.filters_by_name.party_type.get_value();
-			default: frappe.defaults.get_user_default("company")
+				var party = frappe.query_report.filters_by_name.party.get_value();
+				if(party && !party_type) {
+					frappe.throw(__("Please select Party Type first"));
+				}
+				return party_type;
+			}
 		},
 	]
 }

erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py

@@ -20,16 +20,16 @@ def execute(filters=None):
 	for d in entries:
 		if d.against_voucher:
 			against_date = d.against_voucher and invoice_posting_date_map[d.against_voucher] or ""
-			outstanding_amount = flt(d.debit) or -1 * flt(d.credit)
+			payment_amount = flt(d.debit) or -1 * flt(d.credit)
 		else:
 			against_date = d.against_invoice and invoice_posting_date_map[d.against_invoice] or ""
-			outstanding_amount = flt(d.credit) or -1 * flt(d.debit)
+			payment_amount = flt(d.credit) or -1 * flt(d.debit)
 
-		row = [d.name, d.account, d.posting_date, d.against_voucher or d.against_invoice,
+		row = [d.name, d.party_type, d.party, d.posting_date, d.against_voucher or d.against_invoice,
 			against_date, d.debit, d.credit, d.cheque_no, d.cheque_date, d.remark]
 
 		if d.against_voucher or d.against_invoice:
-			row += get_ageing_data(30, 60, 90, d.posting_date, against_date, outstanding_amount)
+			row += get_ageing_data(30, 60, 90, d.posting_date, against_date, payment_amount)
 		else:
 			row += ["", "", "", "", ""]
 
@@ -38,7 +38,8 @@ def execute(filters=None):
 	return columns, data
 
 def get_columns():
-	return [_("Journal Entry") + ":Link/Journal Entry:140", _("Account") + ":Link/Account:140",
+	return [_("Journal Entry") + ":Link/Journal Entry:140", 
+		_("Party Type") + ":Link/DocType:100", _("Party") + ":Dynamic Link/party_type:140",
 		_("Posting Date") + ":Date:100", _("Against Invoice") + ":Link/Purchase Invoice:130",
 		_("Against Invoice Posting Date") + ":Date:130", _("Debit") + ":Currency:120", _("Credit") + ":Currency:120",
 		_("Reference No") + "::100", _("Reference Date") + ":Date:100", _("Remarks") + "::150", _("Age") +":Int:40",
@@ -46,41 +47,38 @@ def get_columns():
 	]
 
 def get_conditions(filters):
-	conditions = ""
+	conditions = []
-	party = None
 
-	if filters.get("account"):
+	if not filters.get("party_type"):
-		party = filters["account"]
+		if filters.get("payment_type") == "Outgoing":
-	else:
+			filters["party_type"] = "Supplier"
-		conditions += " and company = '%s'" % frappe.db.escape(filters["company"])
+		else:
+			filters["party_type"] = "Customer"
 	
-		account_type = "Receivable" if filters.get("payment_type") == "Incoming" else "Payable"
+	if filters.get("party_type"):
+		conditions.append("jvd.party_type=%(party_type)s")
 
-		conditions += """ and account in
+	if filters.get("party"):
-			(select name from tabAccount
+		conditions.append("jvd.party=%(party)s")
-				where account_type = '{0}'
-				and company='{1}')""".format(account_type, frappe.db.escape(filters["company"]))
 
-	if party:
+	if filters.get("company"):
-		conditions += " and jvd.party = '%s'" % frappe.db.escape(party)
+		conditions.append("jv.company=%(company)s")
-	else:
-		conditions += " and ifnull(jvd.party, '') != ''"
 
 	if filters.get("from_date"):
-		conditions += " and jv.posting_date >= '%s'" % filters["from_date"]
+		conditions.append("jv.posting_date >= %(from_date)s")
 	if filters.get("to_date"):
-		conditions += " and jv.posting_date <= '%s'" % filters["to_date"]
+		conditions.append("jv.posting_date <= %(to_date)s")
 
-	return conditions
+	return "and {}".format(" and ".join(conditions)) if conditions else ""
 
 def get_entries(filters):
 	conditions = get_conditions(filters)
-	entries =  frappe.db.sql("""select jv.name, jvd.account, jv.posting_date,
+	entries =  frappe.db.sql("""select jv.name, jvd.party_type, jvd.party, jv.posting_date,
 		jvd.against_voucher, jvd.against_invoice, jvd.debit, jvd.credit,
 		jv.cheque_no, jv.cheque_date, jv.remark
 		from `tabJournal Entry Account` jvd, `tabJournal Entry` jv
 		where jvd.parent = jv.name and jv.docstatus=1 %s order by jv.name DESC""" %
-		conditions, as_dict=1, debug=1)
+		conditions, filters, as_dict=1)
 
 	return entries