schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #42869 from frappe/mergify/bp/version-15-hotfix/pr-42851

Browse Source 
refactor: Allow equity type Account in Payment Entry for shareholders (backport #42851)
This commit is contained in:
ruthra kumar
2024-08-22 17:30:50 +05:30
committed by GitHub
parent edf53f1ab7 49d995c3ac
commit eed6d2b81c
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,11 @@ frappe.ui.form.on("Payment Entry", {
var account_types = ["Pay", "Internal Transfer"].includes(frm.doc.payment_type) var account_types = ["Pay", "Internal Transfer"].includes(frm.doc.payment_type)
? ["Bank", "Cash"] ? ["Bank", "Cash"]
: [frappe.boot.party_account_types[frm.doc.party_type]]; : [frappe.boot.party_account_types[frm.doc.party_type]];
if (frm.doc.party_type == "Shareholder") {
account_types.push("Equity");
}
return { return {
filters: { filters: {
account_type: ["in", account_types], account_type: ["in", account_types],
@@ -90,6 +95,9 @@ frappe.ui.form.on("Payment Entry", {
var account_types = ["Receive", "Internal Transfer"].includes(frm.doc.payment_type) var account_types = ["Receive", "Internal Transfer"].includes(frm.doc.payment_type)
? ["Bank", "Cash"] ? ["Bank", "Cash"]
: [frappe.boot.party_account_types[frm.doc.party_type]]; : [frappe.boot.party_account_types[frm.doc.party_type]];
if (frm.doc.party_type == "Shareholder") {
account_types.push("Equity");
}
return { return {
filters: { filters: {
account_type: ["in", account_types], account_type: ["in", account_types],
@@ -412,6 +420,12 @@ frappe.ui.form.on("Payment Entry", {
return { return {
query: "erpnext.controllers.queries.employee_query", query: "erpnext.controllers.queries.employee_query",
}; };
} else if (frm.doc.party_type == "Shareholder") {
return {
filters: {
company: frm.doc.company,
},
};
} }
}); });