diff --git a/erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py b/erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py
index 5a0aeb7..83646c9 100644
--- a/erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py
+++ b/erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py
@@ -38,7 +38,7 @@
 		si.save()
 		si.submit()
 
-		process_deferred_accounting = doc = frappe.get_doc(
+		process_deferred_accounting = frappe.get_doc(
 			dict(
 				doctype="Process Deferred Accounting",
 				posting_date="2019-01-01",
@@ -56,7 +56,7 @@
 			["Sales - _TC", 0.0, 33.85, "2019-01-31"],
 		]
 
-		check_gl_entries(self, si.name, expected_gle, "2019-01-10")
+		check_gl_entries(self, si.name, expected_gle, "2019-01-31")
 
 	def test_pda_submission_and_cancellation(self):
 		pda = frappe.get_doc(
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index eec58e8..3dadd46 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -2273,11 +2273,11 @@
 	)
 
 	if party_type == "Customer":
-		q = q.select(payment_entry.paid_from_account_currency)
+		q = q.select((payment_entry.paid_from_account_currency).as_("currency"))
 		q = q.select(payment_entry.paid_from)
 		q = q.where(payment_entry.paid_from.isin(party_account))
 	else:
-		q = q.select(payment_entry.paid_to_account_currency)
+		q = q.select((payment_entry.paid_to_account_currency).as_("currency"))
 		q = q.select(payment_entry.paid_to)
 		q = q.where(payment_entry.paid_to.isin(party_account))