fixed conflict

patches/march_2013/p07_update_project_in_stock_ledger.py

@@ -0,0 +1,42 @@
+import webnotes
+
+def execute():
+	webnotes.reload_doc("stock", "doctype", "stock_ledger_entry")
+	
+	# from stock entry
+	webnotes.conn.sql("""update 
+		`tabStock Ledger Entry` sle, 
+		`tabStock Entry` st
+	set sle.project = st.project_name
+	where
+	 	sle.voucher_type = "Stock Entry"
+		and sle.voucher_no = st.name""")
+			
+	# from purchase
+	webnotes.conn.sql("""update 
+		`tabStock Ledger Entry` sle, 
+		`tabPurchase Receipt Item` pri
+	set sle.project = pri.project_name
+	where
+	 	sle.voucher_type = "Purchase Receipt"
+		and sle.voucher_detail_no = pri.name""")
+
+	# from delivery note
+	webnotes.conn.sql("""update 
+		`tabStock Ledger Entry` sle, 
+		`tabDelivery Note` dn
+	set sle.project = dn.project_name
+	where
+	 	sle.voucher_type = "Delivery Note"
+		and sle.voucher_no = dn.name""")
+		
+	# from pos invoice
+	webnotes.conn.sql("""update 
+		`tabStock Ledger Entry` sle, 
+		`tabSales Invoice` si
+	set sle.project = si.project_name
+	where
+	 	sle.voucher_type = "Sales Invoice"
+		and sle.voucher_no = si.name""")
+	
+	

patches/patch_list.py

@@ -214,5 +214,8 @@ patch_list = [
 	"patches.march_2013.p04_pos_update_stock_check",
 	"patches.march_2013.p05_payment_reconciliation",
 	"patches.march_2013.p06_remove_sales_purchase_return_tool",
-	"execute:webnotes.bean('Global Defaults').save()"
+	"execute:webnotes.bean('Global Defaults').save()",
+	"patches.march_2013.p07_update_project_in_stock_ledger",
+	"execute:webnotes.bean('Style Settings').save() #2013-03-25",
+	"execute:webnotes.conn.set_value('Email Settings', None, 'send_print_in_body_and_attachment', 1)"
 ]