From 1fe80c2d02766afff9e30d0451bee03d5a23028c Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Fri, 20 Oct 2023 17:16:54 +0530
Subject: [PATCH] refactor: gain_loss posting date fields in the allocation
 table

(cherry picked from commit 55dbcee36a2acf4aa41c66147c263a85ef606f81)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
---
 .../payment_reconciliation_allocation.json                 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json b/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
index a553b982d14..6aaa58aedf7 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
@@ -158,6 +158,7 @@
    "fieldname": "gain_loss_posting_date",
    "fieldtype": "Date",
    "label": "Difference Posting Date"
+<<<<<<< HEAD
   },
   {
    "fieldname": "accounting_dimensions_section",
@@ -167,12 +168,18 @@
   {
    "fieldname": "dimension_col_break",
    "fieldtype": "Column Break"
+=======
+>>>>>>> 55dbcee36a (refactor: gain_loss posting date fields in the allocation table)
   }
  ],
  "is_virtual": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "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",
  "module": "Accounts",
  "name": "Payment Reconciliation Allocation",