diff --git a/erpnext/manufacturing/doctype/bom_creator/bom_creator.py b/erpnext/manufacturing/doctype/bom_creator/bom_creator.py index d67f0c3536b..18599b2c20c 100644 --- a/erpnext/manufacturing/doctype/bom_creator/bom_creator.py +++ b/erpnext/manufacturing/doctype/bom_creator/bom_creator.py @@ -7,6 +7,7 @@ import frappe from frappe import _ from frappe.model.document import Document from frappe.utils import cint, flt, sbool +from pypika.terms import ValueWrapper from erpnext.manufacturing.doctype.bom.bom import get_bom_item_rate @@ -373,7 +374,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", diff --git a/erpnext/patches/v14_0/single_to_multi_dunning.py b/erpnext/patches/v14_0/single_to_multi_dunning.py index 3def5922c07..47d13a0e383 100644 --- a/erpnext/patches/v14_0/single_to_multi_dunning.py +++ b/erpnext/patches/v14_0/single_to_multi_dunning.py @@ -1,4 +1,5 @@ import frappe +from pypika.terms import ValueWrapper 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", + ValueWrapper(0).as_("paid_amount"), "discounted_amount", ], ) diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py index 2119d214a61..80552abe895 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.py +++ b/erpnext/projects/doctype/timesheet/timesheet.py @@ -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},