RobbyV2/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2025-12-03 18:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50733 from vorasmit/qb-changes

Browse Source
This commit is contained in:
Smit Vora
2025-12-02 14:41:58 +05:30
committed by GitHub
parent ba94d02cb4 a2fadd9347
commit 75839f36ba
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/manufacturing/doctype/bom_creator/bom_creator.py
View File

@@ -7,6 +7,7 @@ import frappe
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.utils import cint, flt, sbool from frappe.utils import cint, flt, sbool
from pypika.terms import ValueWrapper
from erpnext.manufacturing.doctype.bom.bom import get_bom_item_rate 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", "parent as parent_id",
"qty", "qty",
"idx", "idx",
"'BOM Creator Item' as doctype", ValueWrapper("BOM Creator Item").as_("doctype"),
"name", "name",
"uom", "uom",
"rate", "rate",

3
erpnext/patches/v14_0/single_to_multi_dunning.py
View File

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

2
erpnext/projects/doctype/timesheet/timesheet.py
View File

@@ -383,7 +383,7 @@ def get_timesheet_data(name, project):
data = frappe.get_all( data = frappe.get_all(
"Timesheet", "Timesheet",
fields=[ 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", "total_billable_hours as billing_hours",
], ],
filters={"name": name}, filters={"name": name},