refactor: further changes to adapt to query builder changes

(cherry picked from commit 8235a551f0)
This commit is contained in:
Smit Vora
2025-11-25 12:08:31 +05:30
committed by Mergify
parent 7bfdd4b0a8
commit 9f07579a05
3 changed files with 6 additions and 3 deletions

View File

@@ -360,6 +360,8 @@ class BOMCreator(Document):
@frappe.whitelist()
def get_children(doctype=None, parent=None, **kwargs):
from pypika.terms import ValueWrapper
if isinstance(kwargs, str):
kwargs = frappe.parse_json(kwargs)
@@ -373,7 +375,7 @@ def get_children(doctype=None, parent=None, **kwargs):
"parent as parent_id",
"qty",
"idx",
"'BOM Creator Item' as doctype",
ValueWrapper("BOM Creator Item").as_("doctype"),
"name",
"uom",
"rate",

View File

@@ -1,4 +1,5 @@
import frappe
from pypika.terms import LiteralValue
from erpnext.accounts.general_ledger import make_reverse_gl_entries
@@ -39,7 +40,7 @@ def execute():
"payment_amount",
# at the time of creating this dunning, the full amount was outstanding
"payment_amount as outstanding",
"'0' as paid_amount",
LiteralValue(0).as_("paid_amount"),
"discounted_amount",
],
)

View File

@@ -383,7 +383,7 @@ def get_timesheet_data(name, project):
data = frappe.get_all(
"Timesheet",
fields=[
"(total_billable_amount - total_billed_amount) as billing_amt",
{"SUB": ["total_billable_amount", "total_billed_amount"], "as": "billing_amt"},
"total_billable_hours as billing_hours",
],
filters={"name": name},