CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 09:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51489 from frappe/mergify/bp/version-15-hotfix/pr-51457

Browse Source 
fix: add company filters to project (backport #51457)
This commit is contained in:
ruthra kumar
2026-01-05 11:19:33 +05:30
committed by GitHub
parent 0d790a6cd5 d6511b0045
commit 7bbcafed8d
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/doctype/journal_entry/journal_entry.js
View File

@@ -20,6 +20,23 @@ frappe.ui.form.on("Journal Entry", {
"Unreconcile Payment Entries",
"Bank Transaction",
];
frm.trigger("set_queries");
},
set_queries(frm) {
frm.set_query("project", "accounts", function (doc, cdt, cdn) {
let row = frappe.get_doc(cdt, cdn);
let filters = {
company: doc.company,
};
if (row.party_type == "Customer") {
filters.customer = row.party;
}
return {
query: "erpnext.controllers.queries.get_project_name",
filters,
};
});
},
refresh: function (frm) {

18
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@@ -140,6 +140,24 @@ frappe.ui.form.on("Stock Entry", {
};
});
frm.set_query("project", "items", function (doc) {
return {
query: "erpnext.controllers.queries.get_project_name",
filters: {
company: doc.company,
},
};
});
frm.set_query("project", function (doc) {
return {
query: "erpnext.controllers.queries.get_project_name",
filters: {
company: doc.company,
},
};
});
frm.add_fetch("bom_no", "inspection_required", "inspection_required");
erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);