CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 18:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: decorator and merge conflicts

Browse Source
This commit is contained in:
ruthra kumar
2025-01-24 10:24:57 +05:30
parent 1c10e4e92f
commit 2f60f235a8
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
View File

@@ -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
}
}

4
erpnext/controllers/tests/test_accounts_controller.py
View File

@@ -869,9 +869,7 @@ class TestAccountsController(FrappeTestCase):
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