nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 03:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: support JE posting date in semi-auto reconciilation tool

Browse Source 
(cherry picked from commit a71718883e)

# Conflicts:
#	erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
This commit is contained in:
ruthra kumar
2025-01-23 16:09:54 +05:30
committed by Mergify
parent c90d33acc3
commit 1c10e4e92f
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
View File

@@ -20,6 +20,7 @@
"is_advance", "is_advance",
"section_break_5", "section_break_5",
"difference_amount", "difference_amount",
"gain_loss_posting_date",
"column_break_7", "column_break_7",
"difference_account", "difference_account",
"exchange_rate", "exchange_rate",
@@ -153,11 +154,20 @@
"fieldtype": "Check", "fieldtype": "Check",
"in_list_view": 1, "in_list_view": 1,
"label": "Reconciled" "label": "Reconciled"
},
{
"fieldname": "gain_loss_posting_date",
"fieldtype": "Date",
"label": "Difference Posting Date"
} }
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-03-20 21:05:43.121945", "modified": "2023-03-20 21:05:43.121945",
=======
"modified": "2025-01-23 16:09:01.058574",
>>>>>>> a71718883e (refactor: support JE posting date in semi-auto reconciilation tool)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Payment Reconciliation Log Allocations", "name": "Process Payment Reconciliation Log Allocations",

1
erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.py
View File

@@ -20,6 +20,7 @@ class ProcessPaymentReconciliationLogAllocations(Document):
difference_account: DF.Link | None difference_account: DF.Link | None
difference_amount: DF.Currency difference_amount: DF.Currency
exchange_rate: DF.Float exchange_rate: DF.Float
gain_loss_posting_date: DF.Date | None
invoice_number: DF.DynamicLink invoice_number: DF.DynamicLink
invoice_type: DF.Link invoice_type: DF.Link
is_advance: DF.Data | None is_advance: DF.Data | None