schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: toggle debit credit amounts for transaction currency too; minor refactor

Browse Source 
(cherry picked from commit 8e759c32c4)
This commit is contained in:
Smit Vora
2024-11-21 18:30:37 +05:30
committed by Mergify
parent 723d10241b
commit 7f8334f29a
1 changed files with 30 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
erpnext/accounts/general_ledger.py
View File

@@ -315,66 +315,48 @@ def check_if_in_list(gle, gl_map):
def toggle_debit_credit_if_negative(gl_map): def toggle_debit_credit_if_negative(gl_map):
debit_credit_field_map = {
"debit": "credit",
"debit_in_account_currency": "credit_in_account_currency",
"debit_in_transaction_currency": "credit_in_transaction_currency",
}
for entry in gl_map: for entry in gl_map:
# toggle debit, credit if negative entry # toggle debit, credit if negative entry
if flt(entry.debit) < 0 and flt(entry.credit) < 0 and flt(entry.debit) == flt(entry.credit): for debit_field, credit_field in debit_credit_field_map.items():
entry.credit *= -1 debit = flt(entry.get(debit_field))
entry.debit *= -1 credit = flt(entry.get(credit_field))
if ( if debit < 0 and credit < 0 and debit == credit:
flt(entry.debit_in_account_currency) < 0 debit *= -1
and flt(entry.credit_in_account_currency) < 0 credit *= -1
and flt(entry.debit_in_account_currency) == flt(entry.credit_in_account_currency)
):
entry.credit_in_account_currency *= -1
entry.debit_in_account_currency *= -1
if flt(entry.debit) < 0: if debit < 0:
entry.credit = flt(entry.credit) - flt(entry.debit) credit = credit - debit
entry.debit = 0.0 debit = 0.0
if flt(entry.debit_in_account_currency) < 0: if credit < 0:
entry.credit_in_account_currency = flt(entry.credit_in_account_currency) - flt( debit = debit - credit
entry.debit_in_account_currency credit = 0.0
)
entry.debit_in_account_currency = 0.0
if flt(entry.credit) < 0: # update net values
entry.debit = flt(entry.debit) - flt(entry.credit) # In some scenarios net value needs to be shown in the ledger
entry.credit = 0.0 # This method updates net values as debit or credit
if entry.post_net_value and debit and credit:
if debit > credit:
debit = debit - credit
credit = 0.0
if flt(entry.credit_in_account_currency) < 0: else:
entry.debit_in_account_currency = flt(entry.debit_in_account_currency) - flt( credit = credit - debit
entry.credit_in_account_currency debit = 0.0
)
entry.credit_in_account_currency = 0.0
update_net_values(entry) entry[debit_field] = debit
entry[credit_field] = credit
return gl_map return gl_map
def update_net_values(entry):
# In some scenarios net value needs to be shown in the ledger
# This method updates net values as debit or credit
if entry.post_net_value and entry.debit and entry.credit:
if entry.debit > entry.credit:
entry.debit = entry.debit - entry.credit
entry.debit_in_account_currency = (
entry.debit_in_account_currency - entry.credit_in_account_currency
)
entry.credit = 0
entry.credit_in_account_currency = 0
else:
entry.credit = entry.credit - entry.debit
entry.credit_in_account_currency = (
entry.credit_in_account_currency - entry.debit_in_account_currency
)
entry.debit = 0
entry.debit_in_account_currency = 0
def save_entries(gl_map, adv_adj, update_outstanding, from_repost=False): def save_entries(gl_map, adv_adj, update_outstanding, from_repost=False):
if not from_repost: if not from_repost:
validate_cwip_accounts(gl_map) validate_cwip_accounts(gl_map)