Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove multiple against account values from gle

Browse Source
This commit is contained in:
Gursheen Anand 2023-10-11 15:56:59 +05:30
parent 28445058ef
commit 35d92abe73
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@ -680,23 +680,39 @@ class JournalEntry(AccountsController):
if self.voucher_type in ("Deferred Revenue", "Deferred Expense"): if self.voucher_type in ("Deferred Revenue", "Deferred Expense"):
for d in self.get("accounts"): for d in self.get("accounts"):
if d.reference_type == "Sales Invoice": if d.reference_type == "Sales Invoice":
field = "customer" against_type = "Customer"
else: else:
field = "supplier" against_type = "Supplier"
d.against_account = frappe.db.get_value(d.reference_type, d.reference_name, field) d.against_type = against_type
d.against_account = frappe.db.get_value(
d.reference_type, d.reference_name, against_type.lower()
)
else: else:
for d in self.get("accounts"): for d in self.get("accounts"):
if flt(d.debit) > 0: if flt(d.debit) > 0:
accounts_debited.append(d.party or d.account) accounts_debited.append(d)
if flt(d.credit) > 0: if flt(d.credit) > 0:
accounts_credited.append(d.party or d.account) accounts_credited.append(d)
for d in self.get("accounts"): for d in self.get("accounts"):
if flt(d.debit) > 0: if d.exchange_rate != 1.0:
d.against_account = ", ".join(list(set(accounts_credited))) d.against_type = d.party_type
if flt(d.credit) > 0: d.against_account = d.party
d.against_account = ", ".join(list(set(accounts_debited))) elif flt(d.debit) > 0:
for acc in accounts_credited:
if acc.party == d.party:
d.against_type = "Account"
d.against_account = d.account
d.party_type = ""
d.party = ""
elif flt(d.credit) > 0:
for acc in accounts_debited:
if acc.party == d.party:
d.against_type = "Account"
d.against_account = d.account
d.party_type = ""
d.party = ""
def validate_debit_credit_amount(self): def validate_debit_credit_amount(self):
if not (self.voucher_type == "Exchange Gain Or Loss" and self.multi_currency): if not (self.voucher_type == "Exchange Gain Or Loss" and self.multi_currency):
@ -906,7 +922,7 @@ class JournalEntry(AccountsController):
"party_type": d.party_type, "party_type": d.party_type,
"due_date": self.due_date, "due_date": self.due_date,
"party": d.party, "party": d.party,
"against_type": "Account", "against_type": d.against_type,
"against": d.against_account, "against": d.against_account,
"debit": flt(d.debit, d.precision("debit")), "debit": flt(d.debit, d.precision("debit")),
"credit": flt(d.credit, d.precision("credit")), "credit": flt(d.credit, d.precision("credit")),