diff --git a/erpnext/accounts/report/non_billed_report.py b/erpnext/accounts/report/non_billed_report.py index 22f45fce2325abf5eb55b2eab50f412e81e9da4a..295cc34c686c3e5c07d63ad88ba9a7a1cb6b5e48 100644 --- a/erpnext/accounts/report/non_billed_report.py +++ b/erpnext/accounts/report/non_billed_report.py @@ -22,6 +22,7 @@ def get_ordered_to_be_billed_data(args, filters=None): doctype = frappe.qb.DocType(doctype) child_doctype = frappe.qb.DocType(child_tab) + item = frappe.qb.DocType("Item") docname = filters.get(args.get("reference_field"), None) project_field = get_project_field(doctype, child_doctype, party) @@ -30,6 +31,8 @@ def get_ordered_to_be_billed_data(args, filters=None): frappe.qb.from_(doctype) .inner_join(child_doctype) .on(doctype.name == child_doctype.parent) + .join(item) + .on(item.name == child_doctype.item_code) .select( doctype.name, doctype[args.get("date")].as_("date"), @@ -55,6 +58,7 @@ def get_ordered_to_be_billed_data(args, filters=None): & (doctype.company == filters.get("company")) & (doctype.posting_date <= filters.get("posting_date")) & (child_doctype.amount > 0) + & (item.is_stock_item == 1) & ( child_doctype.base_amount - Round(child_doctype.billed_amt * IfNull(doctype.conversion_rate, 1), precision)