chore: resolve conflicts

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js

@@ -254,7 +254,7 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 			this.data = [];
 			const dialog = new frappe.ui.Dialog({
 				title: __("Select Difference Account"),
-				size: 'extra-large',
+				size: "extra-large",
 				fields: [
 					{
 						fieldname: "allocation",
@@ -266,7 +266,6 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 						get_data: () => {
 							return this.data;
 						},
-<<<<<<< HEAD
 						fields: [
 							{
 								fieldtype: "Data",
@@ -281,6 +280,13 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 								in_list_view: 1,
 								read_only: 1,
 							},
+							{
+								fieldtype: "Date",
+								fieldname: "gain_loss_posting_date",
+								label: __("Posting Date"),
+								in_list_view: 1,
+								reqd: 1,
+							},
 							{
 								fieldtype: "Link",
 								options: "Account",
@@ -305,48 +311,6 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 								read_only: 1,
 							},
 						],
-=======
-						fields: [{
-							fieldtype:'Data',
-							fieldname:"docname",
-							in_list_view: 1,
-							hidden: 1
-						}, {
-							fieldtype:'Data',
-							fieldname:"reference_name",
-							label: __("Voucher No"),
-							in_list_view: 1,
-							read_only: 1
-						}, {
-							fieldtype:'Date',
-							fieldname:"gain_loss_posting_date",
-							label: __("Posting Date"),
-							in_list_view: 1,
-							reqd: 1,
-						}, {
-
-							fieldtype:'Link',
-							options: 'Account',
-							in_list_view: 1,
-							label: __("Difference Account"),
-							fieldname: 'difference_account',
-							reqd: 1,
-							get_query: () => {
-								return {
-									filters: {
-										company: this.frm.doc.company,
-										is_group: 0
-									}
-								}
-							}
-						}, {
-							fieldtype:'Currency',
-							in_list_view: 1,
-							label: __("Difference Amount"),
-							fieldname: 'difference_amount',
-							read_only: 1
-						}]
->>>>>>> 5323bb7bee (refactor: introduce fields in popup)
 					},
 					{
 						fieldtype: "HTML",
@@ -356,7 +320,6 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 				primary_action: () => {
 					const args = dialog.get_values()["allocation"];
 
-<<<<<<< HEAD
 					args.forEach((d) => {
 						frappe.model.set_value(
 							"Payment Reconciliation Allocation",
@@ -364,14 +327,12 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 							"difference_account",
 							d.difference_account
 						);
-=======
-					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)
+						frappe.model.set_value(
+							"Payment Reconciliation Allocation",
+							d.docname,
+							"gain_loss_posting_date",
+							d.gain_loss_posting_date
+						);
 					});
 
 					this.reconcile_payment_entries();
@@ -383,18 +344,11 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 			this.frm.doc.allocation.forEach((d) => {
 				if (d.difference_amount) {
 					dialog.fields_dict.allocation.df.data.push({
-<<<<<<< HEAD
 						docname: d.name,
 						reference_name: d.reference_name,
 						difference_amount: d.difference_amount,
 						difference_account: d.difference_account,
-=======
-						'docname': d.name,
-						'reference_name': d.reference_name,
-						'difference_amount': d.difference_amount,
-						'difference_account': d.difference_account,
-						'gain_loss_posting_date': d.gain_loss_posting_date
->>>>>>> 5323bb7bee (refactor: introduce fields in popup)
+						gain_loss_posting_date: d.gain_loss_posting_date,
 					});
 				}
 			});

erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

@@ -159,7 +159,6 @@
    "fieldname": "gain_loss_posting_date",
    "fieldtype": "Date",
    "label": "Difference Posting Date"
-<<<<<<< HEAD
   },
   {
    "fieldname": "accounting_dimensions_section",
@@ -169,18 +168,12 @@
   {
    "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",

erpnext/accounts/utils.py

@@ -726,11 +726,7 @@ 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: