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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-08-22 17:33:26 +05:30
parent 30ad25d86c
commit 164b417136
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,19 +21,13 @@ frappe.ui.form.on('Payment Entry', {
frm.set_query("paid_from", function() { frm.set_query("paid_from", function() {
frm.events.validate_company(frm); frm.events.validate_company(frm);
<<<<<<< HEAD
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]];
=======
var account_types = ["Pay", "Internal Transfer"].includes(frm.doc.payment_type)
? ["Bank", "Cash"]
: [frappe.boot.party_account_types[frm.doc.party_type]];
if (frm.doc.party_type == "Shareholder") { if (frm.doc.party_type == "Shareholder") {
account_types.push("Equity"); account_types.push("Equity");
} }
>>>>>>> 6cbf98294a (refactor: allow equity types on Payment Entry)
return { return {
filters: { filters: {
"account_type": ["in", account_types], "account_type": ["in", account_types],
@@ -86,17 +80,11 @@ frappe.ui.form.on('Payment Entry', {
frm.set_query("paid_to", function() { frm.set_query("paid_to", function() {
frm.events.validate_company(frm); frm.events.validate_company(frm);
<<<<<<< HEAD
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]];
=======
var account_types = ["Receive", "Internal Transfer"].includes(frm.doc.payment_type)
? ["Bank", "Cash"]
: [frappe.boot.party_account_types[frm.doc.party_type]];
if (frm.doc.party_type == "Shareholder") { if (frm.doc.party_type == "Shareholder") {
account_types.push("Equity"); account_types.push("Equity");
} }
>>>>>>> 6cbf98294a (refactor: allow equity types on Payment Entry)
return { return {
filters: { filters: {
"account_type": ["in", account_types], "account_type": ["in", account_types],
@@ -339,7 +327,6 @@ frappe.ui.form.on('Payment Entry', {
frm.set_query("party", function() { frm.set_query("party", function() {
if(frm.doc.party_type == 'Employee'){ if(frm.doc.party_type == 'Employee'){
return { return {
<<<<<<< HEAD
query: "erpnext.controllers.queries.employee_query" query: "erpnext.controllers.queries.employee_query"
} }
} }
@@ -347,16 +334,12 @@ frappe.ui.form.on('Payment Entry', {
return { return {
query: "erpnext.controllers.queries.customer_query" query: "erpnext.controllers.queries.customer_query"
} }
=======
query: "erpnext.controllers.queries.employee_query",
};
} else if (frm.doc.party_type == "Shareholder") { } else if (frm.doc.party_type == "Shareholder") {
return { return {
filters: { filters: {
company: frm.doc.company, company: frm.doc.company,
}, },
}; };
>>>>>>> 63ad9f4f86 (refactor: filter shareholder on company)
} }
}); });