nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 20:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42868 from frappe/mergify/bp/version-14-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:50:51 +05:30
committed by GitHub
parent 752f93c630 164b417136
commit dffd5f291d
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

@@ -23,6 +23,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"] : [frappe.boot.party_account_types[frm.doc.party_type]]; ["Bank", "Cash"] : [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],
@@ -77,6 +82,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"] : [frappe.boot.party_account_types[frm.doc.party_type]]; ["Bank", "Cash"] : [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],
@@ -326,6 +334,12 @@ frappe.ui.form.on('Payment Entry', {
return { return {
query: "erpnext.controllers.queries.customer_query" query: "erpnext.controllers.queries.customer_query"
} }
} else if (frm.doc.party_type == "Shareholder") {
return {
filters: {
company: frm.doc.company,
},
};
} }
}); });