diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 89e31fc92436d6b9d874652db2c78b3a9402a5da..3697c8b32272d57f5b59572eadddd90e579c53ad 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -2900,13 +2900,20 @@ def get_advance_journal_entries( else: q = q.where(journal_acc.debit_in_account_currency > 0) + order_list_query = (journal_acc.reference_type == order_doctype) & ( + (journal_acc.reference_name).isin(order_list) + ) if include_unallocated: - q = q.where((journal_acc.reference_name.isnull()) | (journal_acc.reference_name == "")) - - if order_list: - q = q.where( - (journal_acc.reference_type == order_doctype) & ((journal_acc.reference_name).isin(order_list)) + include_unallocated_query = (journal_acc.reference_name.isnull()) | ( + journal_acc.reference_name == "" ) + if order_list: + q = q.where(include_unallocated_query | order_list_query) + else: + q = q.where(include_unallocated_query) + + elif order_list: + q = q.where(order_list_query) q = q.orderby(journal_entry.posting_date)