CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 03:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: show only stock items in delivered items to be billed and received items to be billed reports

Browse Source 
(cherry picked from commit 1b2e5c9706)
This commit is contained in:
ravibharathi656
2025-11-08 15:06:58 +05:30
committed by Mergify
parent f00236e669
commit 3dbc90a0b4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/non_billed_report.py
View File

@@ -21,6 +21,7 @@ def get_ordered_to_be_billed_data(args, filters=None):
doctype = frappe.qb.DocType(doctype) doctype = frappe.qb.DocType(doctype)
child_doctype = frappe.qb.DocType(child_tab) child_doctype = frappe.qb.DocType(child_tab)
item = frappe.qb.DocType("Item")
docname = filters.get(args.get("reference_field"), None) docname = filters.get(args.get("reference_field"), None)
project_field = get_project_field(doctype, child_doctype, party) project_field = get_project_field(doctype, child_doctype, party)
@@ -29,6 +30,8 @@ def get_ordered_to_be_billed_data(args, filters=None):
frappe.qb.from_(doctype) frappe.qb.from_(doctype)
.inner_join(child_doctype) .inner_join(child_doctype)
.on(doctype.name == child_doctype.parent) .on(doctype.name == child_doctype.parent)
.join(item)
.on(item.name == child_doctype.item_code)
.select( .select(
doctype.name, doctype.name,
doctype[args.get("date")].as_("date"), doctype[args.get("date")].as_("date"),
@@ -54,6 +57,7 @@ def get_ordered_to_be_billed_data(args, filters=None):
& (doctype.company == filters.get("company")) & (doctype.company == filters.get("company"))
& (doctype.posting_date <= filters.get("posting_date")) & (doctype.posting_date <= filters.get("posting_date"))
& (child_doctype.amount > 0) & (child_doctype.amount > 0)
& (item.is_stock_item == 1)
& ( & (
child_doctype.base_amount child_doctype.base_amount
- Round(child_doctype.billed_amt * IfNull(doctype.conversion_rate, 1), precision) - Round(child_doctype.billed_amt * IfNull(doctype.conversion_rate, 1), precision)