From 69efd2ee245de4972658e11ba82c4d2653a903ee Mon Sep 17 00:00:00 2001 From: Shridhar Patil Date: Mon, 3 Oct 2022 11:07:24 +0530 Subject: [PATCH] fix: fixes query builder order by issue in postgres (#32441) * fix: fixes query builder order by issue in postgres * fix: linter --- erpnext/accounts/doctype/bank_clearance/bank_clearance.py | 6 ++++-- erpnext/accounts/utils.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py index 1a572d9823..78c3526654 100644 --- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py +++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py @@ -99,7 +99,7 @@ class BankClearance(Document): .where(loan_disbursement.clearance_date.isnull()) .where(loan_disbursement.disbursement_account.isin([self.bank_account, self.account])) .orderby(loan_disbursement.disbursement_date) - .orderby(loan_disbursement.name, frappe.qb.desc) + .orderby(loan_disbursement.name, order=frappe.qb.desc) ).run(as_dict=1) loan_repayment = frappe.qb.DocType("Loan Repayment") @@ -126,7 +126,9 @@ class BankClearance(Document): if frappe.db.has_column("Loan Repayment", "repay_from_salary"): query = query.where((loan_repayment.repay_from_salary == 0)) - query = query.orderby(loan_repayment.posting_date).orderby(loan_repayment.name, frappe.qb.desc) + query = query.orderby(loan_repayment.posting_date).orderby( + loan_repayment.name, order=frappe.qb.desc + ) loan_repayments = query.run(as_dict=True) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index c5eb7d8733..9ede67848d 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -86,7 +86,7 @@ def get_fiscal_years( ) ) - query = query.orderby(FY.year_start_date, Order.desc) + query = query.orderby(FY.year_start_date, order=Order.desc) fiscal_years = query.run(as_dict=True) frappe.cache().hset("fiscal_years", company, fiscal_years)