Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: skip fixed assets in product bundle (backport #38269) #38316

Merged
merged 8 commits into from
Nov 24, 2023
Merged

fix: skip fixed assets in product bundle (backport #38269) #38316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
314a91a
fix: skip fixed assets in parent
GursheenK Nov 22, 2023
fcd53be
feat: add disabled field in product bundle
GursheenK Nov 22, 2023
fb517e8
fix: filter bundle items based on disabled check
GursheenK Nov 22, 2023
5c12872
fix: has_product_bundle util to only check for enabled bundles
GursheenK Nov 22, 2023
c0de9c0
fix: validation for existing bundles
GursheenK Nov 22, 2023
e4d9ef1
fix: condition in other bundle utils
GursheenK Nov 22, 2023
3d46b32
fix: skip disabled bundles for non-report utils
GursheenK Nov 22, 2023
d076aca
chore: linting issues
GursheenK Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion erpnext/accounts/doctype/pos_invoice/pos_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ def get_stock_availability(item_code, warehouse):
return bin_qty - pos_sales_qty, is_stock_item
else:
is_stock_item = True
if frappe.db.exists("Product Bundle", item_code):
if frappe.db.exists("Product Bundle", {"name": item_code, "disabled": 0}):
return get_bundle_availability(item_code, warehouse), is_stock_item
else:
is_stock_item = False
Expand Down
11 changes: 6 additions & 5 deletions erpnext/controllers/selling_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,11 +350,12 @@ def get_item_list(self):
return il

def has_product_bundle(self, item_code):
return frappe.db.sql(
"""select name from `tabProduct Bundle`
where new_item_code=%s and docstatus != 2""",
item_code,
)
product_bundle = frappe.qb.DocType("Product Bundle")
return (
frappe.qb.from_(product_bundle)
.select(product_bundle.name)
.where((product_bundle.new_item_code == item_code) & (product_bundle.disabled == 0))
).run()

def get_already_delivered_qty(self, current_docname, so, so_detail):
delivered_via_dn = frappe.db.sql(
Expand Down
Loading
Loading