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

chore: resolve merge confilcts

Browse Source
This commit is contained in:
barredterra
2024-01-11 15:04:01 +01:00
parent 4a1a4b06dd
commit 4998d68564
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/bank_transaction/bank_transaction.py
View File

@@ -2,11 +2,7 @@
# For license information, please see license.txt # For license information, please see license.txt
import frappe import frappe
<<<<<<< HEAD
=======
from frappe import _
from frappe.model.docstatus import DocStatus from frappe.model.docstatus import DocStatus
>>>>>>> 0a95b38166 (fix: unreconcile Bank Transaction on cancel of payment voucher)
from frappe.utils import flt from frappe.utils import flt
from erpnext.controllers.status_updater import StatusUpdater from erpnext.controllers.status_updater import StatusUpdater
@@ -73,7 +69,7 @@ class BankTransaction(StatusUpdater):
"payment_entry": voucher["payment_name"], "payment_entry": voucher["payment_name"],
"allocated_amount": 0.0, # Temporary "allocated_amount": 0.0, # Temporary
} }
child = self.append("payment_entries", pe) self.append("payment_entries", pe)
added = True added = True
# runs on_update_after_submit # runs on_update_after_submit

6
erpnext/accounts/doctype/journal_entry/journal_entry.js
View File

@@ -8,11 +8,7 @@ frappe.provide("erpnext.journal_entry");
frappe.ui.form.on("Journal Entry", { frappe.ui.form.on("Journal Entry", {
setup: function(frm) { setup: function(frm) {
frm.add_fetch("bank_account", "account", "account"); frm.add_fetch("bank_account", "account", "account");
<<<<<<< HEAD frm.ignore_doctypes_on_cancel_all = ["Sales Invoice", "Purchase Invoice", "Journal Entry", "Repost Payment Ledger", "Asset", "Asset Movement", "Repost Accounting Ledger", "Unreconcile Payment", "Unreconcile Payment Entries", "Bank Transaction"];
frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Journal Entry', "Repost Payment Ledger", 'Asset', 'Asset Movement', "Repost Accounting Ledger", "Unreconcile Payment", "Unreconcile Payment Entries"];
=======
frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Journal Entry', "Repost Payment Ledger", 'Asset', 'Asset Movement', 'Asset Depreciation Schedule', "Repost Accounting Ledger", "Unreconcile Payment", "Unreconcile Payment Entries", "Bank Transaction"];
>>>>>>> 0a95b38166 (fix: unreconcile Bank Transaction on cancel of payment voucher)
}, },
refresh: function(frm) { refresh: function(frm) {

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

@@ -7,7 +7,7 @@ cur_frm.cscript.tax_table = "Advance Taxes and Charges";
frappe.ui.form.on('Payment Entry', { frappe.ui.form.on('Payment Entry', {
onload: function(frm) { onload: function(frm) {
frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Journal Entry', 'Repost Payment Ledger','Repost Accounting Ledger', 'Unreconcile Payment', 'Unreconcile Payment Entries', "Bank Transaction"]; frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Journal Entry', 'Repost Payment Ledger', 'Repost Accounting Ledger', 'Unreconcile Payment', 'Unreconcile Payment Entries', 'Bank Transaction'];
if(frm.doc.__islocal) { if(frm.doc.__islocal) {
if (!frm.doc.paid_from) frm.set_value("paid_from_account_currency", null); if (!frm.doc.paid_from) frm.set_value("paid_from_account_currency", null);