Merge branch 'develop' into product-bundle-fixes
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 47b8ebd..1c24825 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -925,6 +925,7 @@
"supplier",
"pricing_rules"
],
+ "condition": lambda doc: doc.parent_item in items_to_map
}
}, target_doc, set_missing_values)
diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py
index 3f73093..095457f 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.py
+++ b/erpnext/stock/doctype/packed_item/packed_item.py
@@ -128,7 +128,8 @@
else:
update_parent_item_price(doc, parent_items[parent_items_index][0], bundle_price)
- bundle_price = 0
+ bundle_item_rate = bundle_item.rate if bundle_item.rate else 0
+ bundle_price = bundle_item.qty * bundle_item_rate
parent_items_index += 1
# for the last product bundle