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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-04-05 07:32:15 +05:30
parent 3dc29cbec8
commit a6834f3875
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/accounts/doctype/bank_transaction/bank_transaction.js
View File

@@ -10,15 +10,12 @@ frappe.ui.form.on("Bank Transaction", {
}, },
}; };
}); });
<<<<<<< HEAD
=======
frm.set_query("bank_account", function () { frm.set_query("bank_account", function () {
return { return {
filters: { is_company_account: 1 }, filters: { is_company_account: 1 },
}; };
}); });
>>>>>>> 4ae11d4384 (chore: formatting)
frm.set_query("payment_document", "payment_entries", function () { frm.set_query("payment_document", "payment_entries", function () {
const payment_doctypes = frm.events.get_payment_doctypes(frm); const payment_doctypes = frm.events.get_payment_doctypes(frm);
@@ -50,25 +47,6 @@ frappe.ui.form.on("Bank Transaction", {
set_bank_statement_filter(frm); set_bank_statement_filter(frm);
}, },
<<<<<<< HEAD
setup: function (frm) {
frm.set_query("party_type", function () {
return {
filters: {
name: ["in", Object.keys(frappe.boot.party_account_types)],
},
};
});
frm.set_query("bank_account", function () {
return {
filters: { is_company_account: 1 },
};
});
},
=======
>>>>>>> 257802aeda (refactor: move `payment_document` query to `setup`)
get_payment_doctypes: function () { get_payment_doctypes: function () {
// get payment doctypes from all the apps // get payment doctypes from all the apps
return ["Payment Entry", "Journal Entry", "Sales Invoice", "Purchase Invoice", "Bank Transaction"]; return ["Payment Entry", "Journal Entry", "Sales Invoice", "Purchase Invoice", "Bank Transaction"];