Merge pull request #4274 from saurabh6790/drop-shipping

[fixes] update delivery status
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index f1d82c3..2f4884b 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -276,7 +276,7 @@
 
 		for item in self.items:
 			if item.delivered_by_supplier:
-				delivered_qty = frappe.db.sql("""select qty
+				item_delivered_qty  = frappe.db.sql("""select qty
 					from `tabPurchase Order Item` poi, `tabPurchase Order` po
 					where poi.prevdoc_docname = %s
 						and poi.prevdoc_doctype = 'Sales Order'
@@ -284,8 +284,8 @@
 						and poi.parent = po.name
 						and po.status = 'Delivered'""", (self.name, item.item_code))
 
-				delivered_qty = delivered_qty[0][0] if delivered_qty else 0
-				item.db_set("delivered_qty", delivered_qty)
+				item_delivered_qty = item_delivered_qty[0][0] if item_delivered_qty else 0
+				item.db_set("delivered_qty", item_delivered_qty)
 
 			delivered_qty += item.delivered_qty
 			tot_qty += item.qty