diff --git a/patches/october_2013/perpetual_inventory_stock_transfer_utility.py b/patches/october_2013/perpetual_inventory_stock_transfer_utility.py
index f59ebdb..2b39be6 100644
--- a/patches/october_2013/perpetual_inventory_stock_transfer_utility.py
+++ b/patches/october_2013/perpetual_inventory_stock_transfer_utility.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import webnotes
-from webnotes.utils import nowdate, nowtime
+from webnotes.utils import nowdate, nowtime, cstr
 from accounts.utils import get_fiscal_year
 
 def execute():
@@ -12,7 +12,8 @@
 		item_map.setdefault(item.name, item)
 	
 	warehouse_map = get_warehosue_map()
-	# naming_series = 
+	naming_series = "STE/13/"
+	
 	for company in webnotes.conn.sql("select name from tabCompany"):
 		stock_entry = [{
 			"doctype": "Stock Entry",
@@ -22,16 +23,28 @@
 			"purpose": "Material Transfer",
 			"company": company[0],
 			"remarks": "Material Transfer to activate perpetual inventory",
-			"fiscal_year": get_fiscal_year(nowdate())
+			"fiscal_year": get_fiscal_year(nowdate())[0]
 		}]
 		expense_account = "Cost of Goods Sold - NISL"
 		cost_center = "Default CC Ledger - NISL"
 		
-		for bin in webnotes.conn.sql("select * from tabBin where company=%s", company[0] as_dict=1):
-			new_warehouse = warehouse_map[bin.warehouse].get("fixed_asset_warehouse") \
-				if cstr(item_map[bin.item_code]) == "Yes" else wh.get("current_asset_warehouse")
-			
+		for bin in webnotes.conn.sql("""select * from tabBin bin where ifnull(item_code, '')!='' 
+				and ifnull(warehouse, '')!='' and ifnull(actual_qty, 0) != 0
+				and (select company from tabWarehouse where name=bin.warehouse)=%s""", 
+				company[0], as_dict=1):
 			item_details = item_map[bin.item_code]
+			new_warehouse = warehouse_map[bin.warehouse].get("fixed_asset_warehouse") \
+				if cstr(item_details.is_asset_item) == "Yes" \
+				else warehouse_map[bin.warehouse].get("current_asset_warehouse")
+				
+			if item_details.has_serial_no == "Yes":
+				serial_no = "\n".join([d[0] for d in webnotes.conn.sql("""select name 
+					from `tabSerial No` where item_code = %s and warehouse = %s""", 
+					(bin.item_code, bin.warehouse))])
+				print serial_no
+			else:
+				serial_no = None
+			
 			stock_entry.append({
 				"doctype": "Stock Entry Detail",
 				"parentfield": "mtn_details",
@@ -45,9 +58,10 @@
 				"stock_uom": item_details.stock_uom,
 				"conversion_factor": 1,
 				"expense_account": expense_account,
-				"cost_center": cost_center
+				"cost_center": cost_center,
+				"serial_no": serial_no
 			})
-			
+		
 		webnotes.bean(stock_entry).insert()
 		
 def get_warehosue_map():
@@ -64,7 +78,7 @@
 			"current_asset_warehouse": "Transit-New - NISL",
 			"fixed_asset_warehouse": ""
 		},
-		"ASSET-MAHAPE": {
+		"ASSET - MAHAPE": {
 			"current_asset_warehouse": "",
 			"fixed_asset_warehouse": "Assets-New - NISL"
 		}
