nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 19:19:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-11-01 14:10:45 +05:30
parent d0a655d5ae
commit ba09ddcc3a
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/controllers/accounts_controller.py
View File

@@ -1948,14 +1948,8 @@ class AccountsController(TransactionBase):
return stock_items return stock_items
<<<<<<< HEAD
def set_total_advance_paid(self):
ple = frappe.qb.DocType("Payment Ledger Entry")
party = self.customer if self.doctype == "Sales Order" else self.supplier
=======
def calculate_total_advance_from_ledger(self): def calculate_total_advance_from_ledger(self):
adv = frappe.qb.DocType("Advance Payment Ledger Entry") adv = frappe.qb.DocType("Advance Payment Ledger Entry")
>>>>>>> 2b2360bf7b (refactor: calculate advance from advance ledger)
advance = ( advance = (
frappe.qb.from_(adv) frappe.qb.from_(adv)
.select(adv.currency.as_("account_currency"), Abs(Sum(adv.amount)).as_("amount")) .select(adv.currency.as_("account_currency"), Abs(Sum(adv.amount)).as_("amount"))
@@ -1968,13 +1962,10 @@ class AccountsController(TransactionBase):
) )
return advance return advance
<<<<<<< HEAD
=======
def set_total_advance_paid(self): def set_total_advance_paid(self):
advance = self.calculate_total_advance_from_ledger() advance = self.calculate_total_advance_from_ledger()
advance_paid, order_total = None, None advance_paid, order_total = None, None
>>>>>>> 2b2360bf7b (refactor: calculate advance from advance ledger)
if advance: if advance:
advance = advance[0] advance = advance[0]