From 22d352e87586a10ecfb300103514624ada38f58a Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Sun, 22 Oct 2023 20:26:45 +0530
Subject: [PATCH] refactor: pass gain loss posting date to controller

(cherry picked from commit 7e600a6494d7f07c6fd2b8f1cc71857801a2573c)

# Conflicts:
#	erpnext/accounts/utils.py
(cherry picked from commit 125722ae4150d1d443b402119312b797c765c712)
---
 .../payment_reconciliation/payment_reconciliation.js        | 2 ++
 .../payment_reconciliation/payment_reconciliation.py        | 2 ++
 .../payment_reconciliation_allocation.json                  | 1 +
 erpnext/accounts/utils.py                                   | 4 ++++
 erpnext/controllers/accounts_controller.py                  | 6 ++++--
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index a5d080760b2..042a6123ebd 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -368,6 +368,8 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 					args.forEach(d => {
 						frappe.model.set_value("Payment Reconciliation Allocation", d.docname,
 							"difference_account", d.difference_account);
+						frappe.model.set_value("Payment Reconciliation Allocation", d.docname,
+							"gain_loss_posting_date", d.gain_loss_posting_date);
 
 >>>>>>> 5323bb7bee (refactor: introduce fields in popup)
 					});
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 2c4952a0c66..dcb1a16dba4 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -446,6 +446,7 @@ class PaymentReconciliation(Document):
 				res.difference_amount = self.get_difference_amount(pay, inv, res["allocated_amount"])
 				res.difference_account = default_exchange_gain_loss_account
 				res.exchange_rate = inv.get("exchange_rate")
+				res.update({"gain_loss_posting_date": pay.get("posting_date")})
 
 				if pay.get("amount") == 0:
 					entries.append(res)
@@ -562,6 +563,7 @@ class PaymentReconciliation(Document):
 				"allocated_amount": flt(row.get("allocated_amount")),
 				"difference_amount": flt(row.get("difference_amount")),
 				"difference_account": row.get("difference_account"),
+				"difference_posting_date": row.get("gain_loss_posting_date"),
 				"cost_center": row.get("cost_center"),
 			}
 		)
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 6aaa58aedf7..c40d0ce29d3 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
@@ -19,6 +19,7 @@
   "is_advance",
   "section_break_5",
   "difference_amount",
+  "gain_loss_posting_date",
   "column_break_7",
   "difference_account",
   "exchange_rate",
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 0e6c041d24d..c2653237e5a 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -726,7 +726,11 @@ def update_reference_in_payment_entry(
 		payment_entry.set_missing_ref_details(ref_exchange_rate=d.exchange_rate or None)
 	payment_entry.set_amounts()
 	payment_entry.make_exchange_gain_loss_journal(
+<<<<<<< HEAD
 		frappe._dict({"difference_posting_date": d.difference_posting_date}), dimensions_dict
+=======
+		frappe._dict({"difference_posting_date": d.difference_posting_date})
+>>>>>>> 7e600a6494 (refactor: pass gain loss posting date to controller)
 	)
 
 	if not do_not_save:
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index fe4500a41e5..185ef4c22f0 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -1360,7 +1360,9 @@ class AccountsController(TransactionBase):
 								self.name,
 								arg.get("referenced_row"),
 							):
-								posting_date = frappe.db.get_value(arg.voucher_type, arg.voucher_no, "posting_date")
+								posting_date = arg.get("difference_posting_date") or frappe.db.get_value(
+									arg.voucher_type, arg.voucher_no, "posting_date"
+								)
 								je = create_gain_loss_journal(
 									self.company,
 									posting_date,
@@ -1444,7 +1446,7 @@ class AccountsController(TransactionBase):
 
 						je = create_gain_loss_journal(
 							self.company,
-							self.posting_date,
+							args.get("difference_posting_date") if args else self.posting_date,
 							self.party_type,
 							self.party,
 							party_account,