diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 9e12dc70e100834e21e00b281336244093ee9b19..0b2a43a0897642e042865643616e4e72e94e4286 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -1491,7 +1491,7 @@ def make_purchase_order_for_default_supplier(source_name, selected_items=None, t
 		target.qty = flt(source.qty) - (flt(source.ordered_qty) / flt(source.conversion_factor))
 		target.stock_qty = flt(source.stock_qty) - flt(source.ordered_qty)
 		target.project = source_parent.project
-		if source.unit_cost_price: # @dokos
+		if source.unit_cost_price:  # @dokos
 			target.price_list_rate = source.unit_cost_price
 			target.rate = source.unit_cost_price
 			target.margin_rate_or_amount = 0.0
@@ -1551,8 +1551,7 @@ def make_purchase_order_for_default_supplier(source_name, selected_items=None, t
 					"postprocess": update_item,
 					"condition": lambda doc: doc.ordered_qty < doc.stock_qty
 					and doc.supplier == supplier
-					and doc.item_code in items_to_map
-					and doc.delivered_by_supplier == 1,
+					and doc.item_code in items_to_map,  # @dokos
 				},
 			},
 			target_doc,
@@ -1591,7 +1590,7 @@ def make_purchase_order(source_name, selected_items=None, target_doc=None):
 		return drop_ship
 
 	def set_missing_values(source, target):
-		target.supplier = ""
+		target.supplier = source.items[0].supplier  # @dokos
 		target.apply_discount_on = ""
 		target.additional_discount_percentage = 0.0
 		target.discount_amount = 0.0
@@ -1625,7 +1624,7 @@ def make_purchase_order(source_name, selected_items=None, target_doc=None):
 		target.qty = flt(source.qty) - (flt(source.ordered_qty) / flt(source.conversion_factor))
 		target.stock_qty = flt(source.stock_qty) - flt(source.ordered_qty)
 		target.project = source_parent.project
-		if source.unit_cost_price: # @dokos
+		if source.unit_cost_price:  # @dokos
 			target.price_list_rate = source.unit_cost_price
 			target.rate = source.unit_cost_price
 			target.margin_rate_or_amount = 0.0