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

fix: JV query

Browse Source
This commit is contained in:
Deepesh Garg 2023-06-22 18:28:16 +05:30
parent 6d121ae6e4
commit d81d6069fb
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
erpnext/accounts/utils.py
View File

@ -502,24 +502,19 @@ def check_if_advance_entry_modified(args):
frappe.qb.from_(journal_entry) frappe.qb.from_(journal_entry)
.inner_join(journal_acc) .inner_join(journal_acc)
.on(journal_entry.name == journal_acc.parent) .on(journal_entry.name == journal_acc.parent)
) .select(journal_acc[args.get("dr_or_cr")])
.where(
if args.get("dr_or_cr") == "debit_in_account_currency": (journal_acc.account == args.get("account"))
q = q.select(journal_acc.debit_in_account_currency) & ((journal_acc.party_type == args.get("party_type")))
else: & ((journal_acc.party == args.get("party")))
q = q.select(journal_acc.credit_in_account_currency) & (
(journal_acc.reference_type.isnull())
q = q.where( | (journal_acc.reference_type.isin(["", "Sales Order", "Purchase Order"]))
(journal_acc.account == args.get("account")) )
& ((journal_acc.party_type == args.get("party_type"))) & ((journal_entry.name == args.get("voucher_no")))
& ((journal_acc.party == args.get("party"))) & ((journal_acc.name == args.get("voucher_detail_no")))
& ( & ((journal_entry.docstatus == 1))
(journal_acc.reference_type == None)
| (journal_acc.reference_type.isin(["", "Sales Order", "Purchase Order"]))
) )
& ((journal_entry.name == args.get("voucher_no")))
& ((journal_acc.name == args.get("voucher_detail_no")))
& ((journal_entry.docstatus == 1))
) )
else: else: