[fix] [conflict]

stock/doctype/delivery_note/delivery_note.py

@@ -69,11 +69,8 @@ class DocType(SellingController):
 		self.check_stop_sales_order("against_sales_order")
 		self.validate_for_items()
 		self.validate_warehouse()
-		self.validate_uom_is_integer("stock_uom", "qty")		
-
-		# Set actual qty for each item in selected warehouse
-		self.update_current_stock()
-		
+		self.validate_uom_is_integer("stock_uom", "qty")
+		self.update_current_stock()		
 		self.validate_with_previous_doc()
 		
 		self.doc.status = 'Draft'

stock/doctype/stock_entry/stock_entry.py

@@ -366,7 +366,6 @@ class DocType(StockController):
 					
 	def get_item_details(self, arg):
 		arg = json.loads(arg)
-
 		item = webnotes.conn.sql("""select stock_uom, description, item_name, 
 			purchase_account, cost_center from `tabItem` 
 			where name = %s and (ifnull(end_of_life,'')='' or end_of_life ='0000-00-00'