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

refactor: calculate advance from advance ledger

Browse Source
This commit is contained in:
ruthra kumar
2024-10-16 17:21:56 +05:30
parent 575ca5b900
commit 2b2360bf7b
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
erpnext/controllers/accounts_controller.py
View File

@@ -1927,25 +1927,22 @@ class AccountsController(TransactionBase):
return stock_items return stock_items
def set_total_advance_paid(self): def calculate_total_advance_from_ledger(self):
ple = frappe.qb.DocType("Payment Ledger Entry") adv = frappe.qb.DocType("Advance Payment Ledger Entry")
if self.doctype in frappe.get_hooks("advance_payment_receivable_doctypes"):
party = self.customer
if self.doctype in frappe.get_hooks("advance_payment_payable_doctypes"):
party = self.supplier
advance = ( advance = (
frappe.qb.from_(ple) frappe.qb.from_(adv)
.select(ple.account_currency, Abs(Sum(ple.amount_in_account_currency)).as_("amount")) .select(adv.currency, Abs(Sum(adv.amount)).as_("amount"))
.where( .where(
(ple.against_voucher_type == self.doctype) (adv.against_voucher_type == self.doctype)
& (ple.against_voucher_no == self.name) & (adv.against_voucher_no == self.name)
& (ple.party == party) & (adv.company == self.company)
& (ple.delinked == 0)
& (ple.company == self.company)
) )
.run(as_dict=True) .run(as_dict=True)
) )
return advance
def set_total_advance_paid(self):
advance = self.calculate_total_advance_from_ledger()
advance_paid, order_total = None, None advance_paid, order_total = None, None
if advance: if advance: