nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: gain_loss posting date fields in the allocation table

Browse Source 
(cherry picked from commit 55dbcee36a)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
This commit is contained in:
ruthra kumar
2023-10-20 17:16:54 +05:30
committed by Mergify
parent beb8807b2e
commit 1fe80c2d02
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
View File

@@ -158,6 +158,7 @@
"fieldname": "gain_loss_posting_date", "fieldname": "gain_loss_posting_date",
"fieldtype": "Date", "fieldtype": "Date",
"label": "Difference Posting Date" "label": "Difference Posting Date"
<<<<<<< HEAD
}, },
{ {
"fieldname": "accounting_dimensions_section", "fieldname": "accounting_dimensions_section",
@@ -167,12 +168,18 @@
{ {
"fieldname": "dimension_col_break", "fieldname": "dimension_col_break",
"fieldtype": "Column Break" "fieldtype": "Column Break"
=======
>>>>>>> 55dbcee36a (refactor: gain_loss posting date fields in the allocation table)
} }
], ],
"is_virtual": 1, "is_virtual": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-12-14 13:38:26.104150", "modified": "2023-12-14 13:38:26.104150",
=======
"modified": "2023-10-23 10:44:56.066303",
>>>>>>> 55dbcee36a (refactor: gain_loss posting date fields in the allocation table)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation Allocation", "name": "Payment Reconciliation Allocation",