Merge pull request #30882 from fproldan/issue_25414
fix: "Supplier Quotation Comparison" - Tools - Select Default Supplier
diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
index 0f617b5..98ba399 100644
--- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
+++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
@@ -118,6 +118,7 @@
)
.where(loan_repayment.docstatus == 1)
.where(loan_repayment.clearance_date.isnull())
+ .where(loan_repayment.repay_from_salary == 0)
.where(loan_repayment.posting_date >= self.from_date)
.where(loan_repayment.posting_date <= self.to_date)
.where(loan_repayment.payment_account.isin([self.bank_account, self.account]))
diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
index 4c25d7c..0efe086 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
@@ -467,6 +467,7 @@
loan_repayment.posting_date,
)
.where(loan_repayment.docstatus == 1)
+ .where(loan_repayment.repay_from_salary == 0)
.where(loan_repayment.clearance_date.isnull())
.where(loan_repayment.payment_account == bank_account)
)
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
index 2ac1fea..f3ccc86 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
@@ -203,7 +203,7 @@
posting_date = (loan_doc.posting_date).as_("posting_date")
account = loan_doc.payment_account
- entries = (
+ query = (
frappe.qb.from_(loan_doc)
.select(
ConstantColumn(doctype).as_("payment_document"),
@@ -217,9 +217,12 @@
.where(account == filters.get("account"))
.where(posting_date <= getdate(filters.get("report_date")))
.where(ifnull(loan_doc.clearance_date, "4000-01-01") > getdate(filters.get("report_date")))
- .run(as_dict=1)
)
+ if doctype == "Loan Repayment":
+ query.where(loan_doc.repay_from_salary == 0)
+
+ entries = query.run(as_dict=1)
loan_docs.extend(entries)
return loan_docs
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 26c9996..6b6ea89 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -65,7 +65,11 @@
frm.set_value('transaction_date', frappe.datetime.get_today())
}
erpnext.queries.setup_queries(frm, "Warehouse", function() {
- return erpnext.queries.warehouse(frm.doc);
+ return {
+ filters: [
+ ["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
+ ]
+ };
});
frm.set_query('project', function(doc, cdt, cdn) {
@@ -77,7 +81,19 @@
}
});
- erpnext.queries.setup_warehouse_query(frm);
+ frm.set_query('warehouse', 'items', function(doc, cdt, cdn) {
+ let row = locals[cdt][cdn];
+ let query = {
+ filters: [
+ ["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
+ ]
+ };
+ if (row.item_code) {
+ query.query = "erpnext.controllers.queries.warehouse_query";
+ query.filters.push(["Bin", "item_code", "=", row.item_code]);
+ }
+ return query;
+ });
frm.ignore_doctypes_on_cancel_all = ['Purchase Order'];
},