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

patches/august_2013/p02_rename_price_list.py

@@ -5,6 +5,8 @@ from __future__ import unicode_literals
 import webnotes
 
 def execute():
+	webnotes.reload_doc("website", "doctype", "shopping_cart_price_list")
+	
 	for t in [
 			("Supplier Quotation", "price_list_name", "buying_price_list"),
 			("Purchase Order", "price_list_name", "buying_price_list"),
@@ -23,7 +25,7 @@ def execute():
 		if t[2] in table_columns and t[1] in table_columns:
 			# already reloaded, so copy into new column and drop old column
 			webnotes.conn.sql("""update `tab%s` set `%s`=`%s`""" % (t[0], t[2], t[1]))
-			webnotes.conn.sql("""alter table `tab%s` drop column `%s`""" % (t[0], t[1]))
+			webnotes.conn.sql_ddl("""alter table `tab%s` drop column `%s`""" % (t[0], t[1]))
 		elif t[1] in table_columns:
 			webnotes.conn.sql_ddl("alter table `tab%s` change `%s` `%s` varchar(180)" % t)
 

patches/august_2013/p05_employee_birthdays.py

@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 import webnotes
 
 def execute():
+	webnotes.reload_doc("core", "doctype", "event")
 	webnotes.conn.sql("""delete from `tabEvent` where repeat_on='Every Year' and ref_type='Employee'""")
 	for employee in webnotes.conn.sql_list("""select name from `tabEmployee` where status='Active' and 
 		ifnull(date_of_birth, '')!=''"""):

stock/doctype/purchase_receipt/purchase_receipt.js

@@ -127,7 +127,7 @@ cur_frm.cscript.new_contact = function(){
 cur_frm.fields_dict['purchase_receipt_details'].grid.get_field('project_name').get_query = function(doc, cdt, cdn) {
 	return{
 		filters:[
-			['project', 'status', 'not in', 'Completed, Cancelled']
+			['Project', 'status', 'not in', 'Completed, Cancelled']
 		]
 	}
 }