From dac422a0e149905ee739c18b5840ec096d54c1f0 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Wed, 20 Dec 2023 17:19:27 +0530
Subject: [PATCH] refactor: pass dimension details to query

(cherry picked from commit 5dc22e1811bb1841bb8c790cc3a1e1315cef6074)

# Conflicts:
#	erpnext/accounts/utils.py
---
 .../payment_reconciliation.py                   | 17 ++++++++++++-----
 erpnext/accounts/utils.py                       |  6 ++++++
 erpnext/controllers/accounts_controller.py      |  2 ++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 45620bae59f..b7be45a7ebd 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -29,6 +29,7 @@ class PaymentReconciliation(Document):
 		self.common_filter_conditions = []
 		self.accounting_dimension_filter_conditions = []
 		self.ple_posting_date_filter = []
+		self.dimensions = get_dimensions()[0]
 
 	def load_from_db(self):
 		# 'modified' attribute is required for `run_doc_method` to work properly.
@@ -115,8 +116,7 @@ class PaymentReconciliation(Document):
 
 		# pass dynamic dimension filter values to query builder
 		dimensions = {}
-		dimensions_and_defaults = get_dimensions()
-		for x in dimensions_and_defaults[0]:
+		for x in self.dimensions:
 			dimension = x.fieldname
 			if self.get(dimension):
 				dimensions.update({dimension: self.get(dimension)})
@@ -472,7 +472,7 @@ class PaymentReconciliation(Document):
 		self.get_unreconciled_entries()
 
 	def get_payment_details(self, row, dr_or_cr):
-		return frappe._dict(
+		payment_details = frappe._dict(
 			{
 				"voucher_type": row.get("reference_type"),
 				"voucher_no": row.get("reference_name"),
@@ -495,6 +495,14 @@ class PaymentReconciliation(Document):
 			}
 		)
 
+		dimensions_dict = {}
+		for x in self.dimensions:
+			if row.get(x.fieldname):
+				dimensions_dict.update({x.fieldname: row.get(x.fieldname)})
+
+		payment_details.update({"dimensions": dimensions_dict})
+		return payment_details
+
 	def check_mandatory_to_fetch(self):
 		for fieldname in ["company", "party_type", "party", "receivable_payable_account"]:
 			if not self.get(fieldname):
@@ -604,8 +612,7 @@ class PaymentReconciliation(Document):
 
 	def build_dimensions_filter_conditions(self):
 		ple = qb.DocType("Payment Ledger Entry")
-		dimensions_and_defaults = get_dimensions()
-		for x in dimensions_and_defaults[0]:
+		for x in self.dimensions:
 			dimension = x.fieldname
 			if self.get(dimension):
 				self.accounting_dimension_filter_conditions.append(ple[dimension] == self.get(dimension))
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index d9fb75a86d2..74284d9c1d9 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -630,6 +630,11 @@ def update_reference_in_payment_entry(
 		if d.difference_amount is not None
 		else payment_entry.get_exchange_rate(),
 		"exchange_gain_loss": d.difference_amount,
+<<<<<<< HEAD
+=======
+		"account": d.account,
+		"dimensions": d.dimensions,
+>>>>>>> 5dc22e1811 (refactor: pass dimension details to query)
 	}
 
 	if d.voucher_detail_no:
@@ -1991,6 +1996,7 @@ def create_gain_loss_journal(
 	ref2_dn,
 	ref2_detail_no,
 	cost_center,
+	dimensions,
 ) -> str:
 	journal_entry = frappe.new_doc("Journal Entry")
 	journal_entry.voucher_type = "Exchange Gain Or Loss"
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index d5bc69fe5db..9da71654227 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -1178,6 +1178,7 @@ class AccountsController(TransactionBase):
 									self.name,
 									arg.get("referenced_row"),
 									arg.get("cost_center"),
+									{},
 								)
 								frappe.msgprint(
 									_("Exchange Gain/Loss amount has been booked through {0}").format(
@@ -1258,6 +1259,7 @@ class AccountsController(TransactionBase):
 							self.name,
 							d.idx,
 							self.cost_center,
+							{},
 						)
 						frappe.msgprint(
 							_("Exchange Gain/Loss amount has been booked through {0}").format(