From ba09ddcc3a0d02fc8cb318dd381e11e07afcccf5 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 1 Nov 2024 14:10:45 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/controllers/accounts_controller.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 03910516dea..d6016ef7d1d 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -1948,14 +1948,8 @@ class AccountsController(TransactionBase): 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): adv = frappe.qb.DocType("Advance Payment Ledger Entry") ->>>>>>> 2b2360bf7b (refactor: calculate advance from advance ledger) advance = ( frappe.qb.from_(adv) .select(adv.currency.as_("account_currency"), Abs(Sum(adv.amount)).as_("amount")) @@ -1968,13 +1962,10 @@ class AccountsController(TransactionBase): ) return advance -<<<<<<< HEAD -======= def set_total_advance_paid(self): advance = self.calculate_total_advance_from_ledger() advance_paid, order_total = None, None ->>>>>>> 2b2360bf7b (refactor: calculate advance from advance ledger) if advance: advance = advance[0]