From b04c06e0344a99e0041372371f83e200e2c5dcac Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Mon, 3 Nov 2025 13:22:33 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/controllers/accounts_controller.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 949b7a6be56..101b070a192 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -2026,11 +2026,7 @@ class AccountsController(TransactionBase): discount_amount * self.get("conversion_rate"), item.precision("discount_amount"), ), -<<<<<<< HEAD - dr_or_cr + "_in_account_currency": flt( -======= - "debit_in_transaction_currency": flt( ->>>>>>> e41a7b8cd7 (fix(accounts): populate correct fields on GL Entry during discount accounting) + dr_or_cr + "_in_transaction_currency": flt( discount_amount, item.precision("discount_amount") ), "cost_center": item.cost_center, @@ -2051,11 +2047,7 @@ class AccountsController(TransactionBase): discount_amount * self.get("conversion_rate"), item.precision("discount_amount"), ), -<<<<<<< HEAD - rev_dr_cr + "_in_account_currency": flt( -======= - "credit_in_transaction_currency": flt( ->>>>>>> e41a7b8cd7 (fix(accounts): populate correct fields on GL Entry during discount accounting) + rev_dr_cr + "_in_transaction_currency": flt( discount_amount, item.precision("discount_amount") ), "cost_center": item.cost_center,