mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-20 21:49:18 +00:00
chore: rename function set company filters
(cherry picked from commit 4edbe77f67)
# Conflicts:
# erpnext/manufacturing/doctype/job_card/job_card.js
This commit is contained in:
@@ -23,8 +23,8 @@ frappe.ui.form.on("Job Card", {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
frm.events.setCompanyFilters(frm, "source_warehouse");
|
frm.events.set_company_filters(frm, "source_warehouse");
|
||||||
frm.events.setCompanyFilters(frm, "wip_warehouse");
|
frm.events.set_company_filters(frm, "wip_warehouse");
|
||||||
frm.set_query("source_warehouse", "items", () => {
|
frm.set_query("source_warehouse", "items", () => {
|
||||||
return {
|
return {
|
||||||
filters: {
|
filters: {
|
||||||
@@ -42,9 +42,13 @@ frappe.ui.form.on("Job Card", {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
setCompanyFilters(frm, fieldname) {
|
setCompanyFilters(frm, fieldname) {
|
||||||
|
=======
|
||||||
|
set_company_filters(frm, fieldname) {
|
||||||
|
>>>>>>> 4edbe77f67 (chore: rename function set company filters)
|
||||||
frm.set_query(fieldname, () => {
|
frm.set_query(fieldname, () => {
|
||||||
return {
|
return {
|
||||||
filters: {
|
filters: {
|
||||||
|
|||||||
Reference in New Issue
Block a user