mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-20 02:34:41 +00:00
fix: expense_account query override in Purchase Receipt
(cherry picked from commit 292a51c160)
This commit is contained in:
@@ -17,13 +17,6 @@ frappe.ui.form.on("Purchase Receipt", {
|
|||||||
"Landed Cost Voucher": "Landed Cost Voucher",
|
"Landed Cost Voucher": "Landed Cost Voucher",
|
||||||
};
|
};
|
||||||
|
|
||||||
frm.set_query("expense_account", "items", function () {
|
|
||||||
return {
|
|
||||||
query: "erpnext.controllers.queries.get_expense_account",
|
|
||||||
filters: { company: frm.doc.company },
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
frm.set_query("wip_composite_asset", "items", function () {
|
frm.set_query("wip_composite_asset", "items", function () {
|
||||||
return {
|
return {
|
||||||
filters: { is_composite_asset: 1, docstatus: 0 },
|
filters: { is_composite_asset: 1, docstatus: 0 },
|
||||||
@@ -171,6 +164,16 @@ erpnext.stock.PurchaseReceiptController = class PurchaseReceiptController extend
|
|||||||
this.setup_accounting_dimension_triggers();
|
this.setup_accounting_dimension_triggers();
|
||||||
this.setup_posting_date_time_check();
|
this.setup_posting_date_time_check();
|
||||||
super.setup(doc);
|
super.setup(doc);
|
||||||
|
|
||||||
|
this.frm.set_query("expense_account", "items", () => {
|
||||||
|
return {
|
||||||
|
query: "erpnext.controllers.queries.get_expense_account",
|
||||||
|
filters: {
|
||||||
|
company: this.frm.doc.company,
|
||||||
|
disabled: 0,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
refresh() {
|
refresh() {
|
||||||
|
|||||||
Reference in New Issue
Block a user