nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-13 03:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-11-03 13:22:33 +05:30
committed by GitHub
parent 4076798707
commit b04c06e034
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/controllers/accounts_controller.py
View File

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