nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-21 07:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(accounts): populate correct fields on GL Entry during discount accounting

Browse Source 
(cherry picked from commit e41a7b8cd7)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
This commit is contained in:
diptanilsaha
2025-11-03 12:52:05 +05:30
committed by Mergify
parent 8b8427cbf5
commit 4076798707
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/controllers/accounts_controller.py
View File

@@ -2026,7 +2026,11 @@ class AccountsController(TransactionBase):
discount_amount * self.get("conversion_rate"), discount_amount * self.get("conversion_rate"),
item.precision("discount_amount"), item.precision("discount_amount"),
), ),
<<<<<<< HEAD
dr_or_cr + "_in_account_currency": flt( dr_or_cr + "_in_account_currency": flt(
=======
"debit_in_transaction_currency": flt(
>>>>>>> e41a7b8cd7 (fix(accounts): populate correct fields on GL Entry during discount accounting)
discount_amount, item.precision("discount_amount") discount_amount, item.precision("discount_amount")
), ),
"cost_center": item.cost_center, "cost_center": item.cost_center,
@@ -2047,7 +2051,11 @@ class AccountsController(TransactionBase):
discount_amount * self.get("conversion_rate"), discount_amount * self.get("conversion_rate"),
item.precision("discount_amount"), item.precision("discount_amount"),
), ),
<<<<<<< HEAD
rev_dr_cr + "_in_account_currency": flt( rev_dr_cr + "_in_account_currency": flt(
=======
"credit_in_transaction_currency": flt(
>>>>>>> e41a7b8cd7 (fix(accounts): populate correct fields on GL Entry during discount accounting)
discount_amount, item.precision("discount_amount") discount_amount, item.precision("discount_amount")
), ),
"cost_center": item.cost_center, "cost_center": item.cost_center,