Merge branch 'master' of github.com:webnotes/erpnext

patches/april_2012/serial_no_fixes.py

@@ -1,10 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd.
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-def execute():
-	import webnotes
-	from webnotes.modules import reload_doc
-	reload_doc('stock', 'doctype', 'serial_no')
-
-	webnotes.conn.sql("update `tabSerial No` set sle_exists = 1")

patches/august_2013/p05_update_serial_no_status.py

@@ -0,0 +1,5 @@
+import webnotes
+
+def execute():
+	webnotes.conn.sql("""update `tabSerial No` set status = 'Not Available' where status='Not In Store'""")
+	webnotes.conn.sql("""update `tabSerial No` set status = 'Available' where status='In Store'""")

patches/july_2012/packing_list_cleanup_and_serial_no.py

@@ -39,7 +39,7 @@ def execute():
 
 				status = 'Not in Use'
 				if sle and flt(sle[0]['actual_qty']) > 0:
-					status = 'In Store'
+					status = 'Available'
 				elif sle and flt(sle[0]['actual_qty']) < 0:
 					status = 'Delivered'
 				

patches/patch_list.py

@@ -22,7 +22,6 @@ patch_list = [
 	"patches.april_2012.update_role_in_address", 
 	"patches.april_2012.update_permlevel_in_address", 
 	"patches.april_2012.update_appraisal_permission", 
-	"patches.april_2012.serial_no_fixes", 
 	"patches.april_2012.repost_stock_for_posting_time", 
 	"patches.may_2012.cleanup_property_setter", 
 	"patches.may_2012.rename_prev_doctype", 
@@ -254,6 +253,7 @@ patch_list = [
 	"patches.august_2013.p01_hr_settings",
 	"patches.august_2013.p02_rename_price_list",
 	"patches.august_2013.p03_pos_setting_replace_customer_account",
+	"patches.august_2013.p05_update_serial_no_status",
 	"patches.august_2013.p05_employee_birthdays",
 	"execute:webnotes.reload_doc('accounts', 'Print Format', 'POS Invoice') # 2013-08-16",
 ]