fix: decorator and merge conflicts

frappe · Jan 24, 2025 · 2f60f23 · 2f60f23
1 parent 1c10e4e
commit 2f60f23
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/...ayment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json b/...ayment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
@@ -163,11 +163,7 @@
  ],
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-03-20 21:05:43.121945",
-=======
  "modified": "2025-01-23 16:09:01.058574",
->>>>>>> a71718883e (refactor: support JE posting date in semi-auto reconciilation tool)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Payment Reconciliation Log Allocations",
@@ -177,4 +173,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}
diff --git a/erpnext/controllers/tests/test_accounts_controller.py b/erpnext/controllers/tests/test_accounts_controller.py
@@ -869,9 +869,7 @@ def test_16_internal_transfer_at_arms_length_price(self):
 		self.assertEqual(pi.items[0].rate, arms_length_price)
 		self.assertEqual(pi.items[0].valuation_rate, 100)
 
-	@IntegrationTestCase.change_settings(
-		"Accounts Settings", {"exchange_gain_loss_posting_date": "Reconciliation Date"}
-	)
+	@change_settings("Accounts Settings", {"exchange_gain_loss_posting_date": "Reconciliation Date"})
 	def test_17_gain_loss_posting_date_for_normal_payment(self):
 		# Sales Invoice in Foreign Currency
 		rate = 80