diff --git a/patches/may_2013/p01_conversion_factor_and_aii.py b/patches/may_2013/p01_conversion_factor_and_aii.py
new file mode 100644
index 00000000000..89d82e010d5
--- /dev/null
+++ b/patches/may_2013/p01_conversion_factor_and_aii.py
@@ -0,0 +1,26 @@
+import webnotes
+from webnotes.utils import cint
+from accounts.utils import create_stock_in_hand_jv
+
+def execute():
+	webnotes.conn.auto_commit_on_many_writes = True
+	
+	aii_enabled = cint(webnotes.conn.get_value("Global Defaults", None, 
+		"auto_inventory_accounting"))
+	
+	if aii_enabled:
+		create_stock_in_hand_jv(reverse = True)
+	
+	webnotes.conn.sql("""update `tabPurchase Invoice Item` pi_item 
+		set conversion_factor = (select ifnull(if(conversion_factor=0, 1, conversion_factor), 1) 
+			from `tabUOM Conversion Detail` 
+			where parent = pi_item.item_code and uom = pi_item.uom
+		)
+		where ifnull(conversion_factor, 0)=0""")
+	
+	if aii_enabled:
+		create_stock_in_hand_jv()
+	
+	webnotes.conn.auto_commit_on_many_writes = False
+	
+	
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 5475d0f8bcd..74a8af78544 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -251,4 +251,5 @@ patch_list = [
 	"patches.april_2013.rebuild_sales_browser",
 	"patches.april_2013.p08_price_list_country",
 	"patches.may_2013.repost_stock_for_no_posting_time",
+	"patches.may_2013.p01_conversion_factor_and_aii",
 ]
\ No newline at end of file