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

test: fix payment reco tests

Browse Source
This commit is contained in:
Deepesh Garg
2023-06-21 17:49:45 +05:30
parent 92f845c0e1
commit b64ebc6fcc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py
View File

@@ -38,7 +38,7 @@ class TestProcessDeferredAccounting(unittest.TestCase):
si.save() si.save()
si.submit() si.submit()
process_deferred_accounting = doc = frappe.get_doc( process_deferred_accounting = frappe.get_doc(
dict( dict(
doctype="Process Deferred Accounting", doctype="Process Deferred Accounting",
posting_date="2019-01-01", posting_date="2019-01-01",
@@ -56,7 +56,7 @@ class TestProcessDeferredAccounting(unittest.TestCase):
["Sales - _TC", 0.0, 33.85, "2019-01-31"], ["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): def test_pda_submission_and_cancellation(self):
pda = frappe.get_doc( pda = frappe.get_doc(

4
erpnext/controllers/accounts_controller.py
View File

@@ -2273,11 +2273,11 @@ def get_common_query(
) )
if party_type == "Customer": 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.select(payment_entry.paid_from)
q = q.where(payment_entry.paid_from.isin(party_account)) q = q.where(payment_entry.paid_from.isin(party_account))
else: 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.select(payment_entry.paid_to)
q = q.where(payment_entry.paid_to.isin(party_account)) q = q.where(payment_entry.paid_to.isin(party_account))