commit 05a819daf17b652db6a0154eb9c7de098ebef2b1
author Anand Doshi <anand@erpnext.com> Tue Apr 02 16:38:09 2013 +0530
committer Anand Doshi <anand@erpnext.com> Tue Apr 02 16:38:09 2013 +0530
tree d59a2bcf16d2557bb8a85fd0da9bc9983e76ccf0
parent 234b8e3de3a98de10dbe6946209f14a13b3b2611
parent 5c12765313615a3e5d8d6ee38164939ae93b2a77

Merge branch 'edge' of github.com:webnotes/erpnext into edge

Conflicts:
	patches/march_2013/p07_update_valuation_rate.py

patches/march_2013/p07_update_valuation_rate.py

diff --git a/patches/march_2013/p07_update_valuation_rate.py b/patches/march_2013/p07_update_valuation_rate.py
index 2887216..885fad6 100644
--- a/patches/march_2013/p07_update_valuation_rate.py
+++ b/patches/march_2013/p07_update_valuation_rate.py
@@ -12,4 +12,3 @@
 		for item in pi.doclist.get({"parentfield": "entries"}):
 			webnotes.conn.sql("""update `tabPurchase Invoice Item` set valuation_rate = %s 
 				where name = %s""", (item.valuation_rate, item.name))
-