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

patches/may_2013/p05_update_cancelled_gl_entries.py

@@ -0,0 +1,29 @@
+# ERPNext - web based ERP (http://erpnext.com)
+# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import cint
+
+def execute():
+	aii_enabled = cint(webnotes.conn.get_value("Global Defaults", None, 
+		"auto_inventory_accounting"))
+	
+	if aii_enabled:
+		webnotes.conn.sql("""update `tabGL Entry` gle set is_cancelled = 'Yes' 
+			where voucher_type = 'Delivery Note'
+			and exists(select name from `tabDelivery Note` 
+				where name = gle.voucher_no and docstatus = 2)""")

patches/patch_list.py

@@ -252,4 +252,5 @@ patch_list = [
 	"patches.may_2013.p02_update_valuation_rate",
 	"patches.may_2013.p03_update_support_ticket",
 	"patches.may_2013.p04_reorder_level",
+	"patches.may_2013.p05_update_cancelled_gl_entries",
 ]