Merge branch 'develop' into fix-payroll-UI
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 0c5188a..09dc9a9 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -509,10 +509,12 @@
doc.material_request_type = "Purchase"
def update_item(source, target, source_parent):
+ # qty is for packed items, because packed items don't have stock_qty field
+ qty = source.get("stock_qty") or source.get("qty")
target.project = source_parent.project
- target.qty = source.stock_qty - requested_item_qty.get(source.name, 0)
+ target.qty = qty - requested_item_qty.get(source.name, 0)
target.conversion_factor = 1
- target.stock_qty = source.stock_qty - requested_item_qty.get(source.name, 0)
+ target.stock_qty = qty - requested_item_qty.get(source.name, 0)
doc = get_mapped_doc("Sales Order", source_name, {
"Sales Order": {