Skip to content

Commit

Permalink
Merge pull request #39486 from frappe/mergify/bp/version-15-hotfix/pr…
Browse files Browse the repository at this point in the history
…-39484

refactor: move 'project' set_query to sales_common.js (backport #39484)
  • Loading branch information
ruthra-kumar authored Jan 22, 2024
2 parents 3e9449d + 0acbbef commit dc88614
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 19 deletions.
11 changes: 10 additions & 1 deletion erpnext/public/js/utils/sales_common.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@ erpnext.sales_common = {
}
};
});

this.frm.set_query('project', function(doc) {
return {
query: "erpnext.controllers.queries.get_project_name",
filters: {
'customer': doc.customer
}
}
});
}

setup_queries() {
Expand Down Expand Up @@ -439,4 +448,4 @@ erpnext.pre_sales = {
}
});
}
}
}
9 changes: 0 additions & 9 deletions erpnext/selling/doctype/sales_order/sales_order.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,6 @@ frappe.ui.form.on("Sales Order", {
};
});

frm.set_query('project', function(doc, cdt, cdn) {
return {
query: "erpnext.controllers.queries.get_project_name",
filters: {
'customer': doc.customer
}
}
});

frm.set_query('warehouse', 'items', function(doc, cdt, cdn) {
let row = locals[cdt][cdn];
let query = {
Expand Down
9 changes: 0 additions & 9 deletions erpnext/stock/doctype/delivery_note/delivery_note.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,6 @@ frappe.ui.form.on("Delivery Note", {
});
erpnext.queries.setup_warehouse_query(frm);

frm.set_query('project', function(doc) {
return {
query: "erpnext.controllers.queries.get_project_name",
filters: {
'customer': doc.customer
}
}
})

frm.set_query('transporter', function() {
return {
filters: {
Expand Down

0 comments on commit dc88614

Please sign in to comment.