nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-20 07:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add company filter to project

Browse Source 
(cherry picked from commit 1a7b09e576)
This commit is contained in:
venkat102
2024-12-30 14:18:13 +05:30
committed by Mergify
parent 8e55d5cc39
commit d550b433c1
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/payment_entry/payment_entry.js
View File

@@ -27,6 +27,18 @@ frappe.ui.form.on("Payment Entry", {
erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype); erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
// project excluded in setup_dimension_filters
frm.set_query("project", function (doc) {
let filters = {
company: doc.company,
};
if (doc.party_type == "Customer") filters.customer = doc.party;
return {
query: "erpnext.controllers.queries.get_project_name",
filters,
};
});
if (frm.is_new()) { if (frm.is_new()) {
set_default_party_type(frm); set_default_party_type(frm);
} }

8
erpnext/public/js/controllers/buying.js
View File

@@ -25,6 +25,14 @@ erpnext.buying = {
}; };
}); });
this.frm.set_query("project", function (doc) {
return {
filters: {
company: doc.company,
},
};
});
if (this.frm.doc.__islocal if (this.frm.doc.__islocal
&& frappe.meta.has_field(this.frm.doc.doctype, "disable_rounded_total")) { && frappe.meta.has_field(this.frm.doc.doctype, "disable_rounded_total")) {