nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-25 17:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44978 from frappe/mergify/bp/version-15-hotfix/pr-44975

Browse Source 
fix: add company filter to project (backport #44975)
This commit is contained in:
ruthra kumar
2024-12-30 15:55:00 +05:30
committed by GitHub
parent 8e55d5cc39 74220430e5
commit 8b4f5261b4
3 changed files with 28 additions and 4 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);
} }

12
erpnext/controllers/queries.py
View File

@@ -271,10 +271,14 @@ def get_project_name(doctype, txt, searchfield, start, page_len, filters):
qb_filter_or_conditions = [] qb_filter_or_conditions = []
ifelse = CustomFunction("IF", ["condition", "then", "else"]) ifelse = CustomFunction("IF", ["condition", "then", "else"])
if filters and filters.get("customer"): if filters:
qb_filter_and_conditions.append( if filters.get("customer"):
(proj.customer == filters.get("customer")) | proj.customer.isnull() | proj.customer == "" qb_filter_and_conditions.append(
) (proj.customer == filters.get("customer")) | proj.customer.isnull() | proj.customer == ""
)
if filters.get("company"):
qb_filter_and_conditions.append(proj.company == filters.get("company"))
qb_filter_and_conditions.append(proj.status.notin(["Completed", "Cancelled"])) qb_filter_and_conditions.append(proj.status.notin(["Completed", "Cancelled"]))

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")) {