nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 02:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: multiple fixes for advance payment accounting (backport #48341) (#48896)

Browse Source 
* fix: multiple fixes for advance payment accounting

(cherry picked from commit e70caedddc)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
#	erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
#	erpnext/accounts/utils.py
#	erpnext/controllers/accounts_controller.py
#	erpnext/patches/v15_0/create_advance_payment_ledger_records.py

* chore: resolve conflicts

* fix: do not execute patch if no advance doctypes

---------

Co-authored-by: Lakshit Jain <108322669+ljain112@users.noreply.github.com>
Co-authored-by: ljain112 <ljain112@gmail.com>
This commit is contained in:
mergify[bot]
2025-08-01 15:30:30 +05:30
committed by GitHub
parent 5de5a8bfd5
commit cb0addc122
25 changed files with 650 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/public/js/utils/unreconcile.js
View File

@@ -42,8 +42,8 @@ erpnext.accounts.unreconcile_payment = {
selection_map = selections.map(function (elem) {
return {
company: elem.company,
voucher_type: elem.voucher_type,
voucher_no: elem.voucher_no,
voucher_type: elem.reference_doctype,
voucher_no: elem.reference_name,
against_voucher_type: frm.doc.doctype,
against_voucher_no: frm.doc.name,
};
@@ -54,8 +54,8 @@ erpnext.accounts.unreconcile_payment = {
company: elem.company,
voucher_type: frm.doc.doctype,
voucher_no: frm.doc.name,
against_voucher_type: elem.voucher_type,
against_voucher_no: elem.voucher_no,
against_voucher_type: elem.reference_doctype,
against_voucher_no: elem.reference_name,
};
});
}
@@ -69,7 +69,7 @@ erpnext.accounts.unreconcile_payment = {
let child_table_fields = [
{
label: __("Voucher Type"),
fieldname: "voucher_type",
fieldname: "reference_doctype",
fieldtype: "Link",
options: "DocType",
in_list_view: 1,
@@ -77,9 +77,9 @@ erpnext.accounts.unreconcile_payment = {
},
{
label: __("Voucher No"),
fieldname: "voucher_no",
fieldname: "reference_name",
fieldtype: "Dynamic Link",
options: "voucher_type",
options: "reference_doctype",
in_list_view: 1,
read_only: 1,
},