commit a2a25abfa5dcc9cf642be9df77a875bf7d01f0a3
author Saurabh <saurabh6790@gmail.com> Thu Oct 06 18:20:53 2016 +0530
committer Saurabh <saurabh6790@gmail.com> Thu Oct 06 18:20:53 2016 +0530
tree 2407bfa972958c2a96b2625a5f56430ff32c56a7
parent 60a099cd85eb94165140659f1637b1d5970ae674

[fix] warehouse account rename fix #6526

erpnext/stock/doctype/warehouse/warehouse.py

diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index f657ebf..8e7941c 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -150,7 +150,10 @@
 		return new_warehouse
 
 	def rename_account_for(self, olddn, newdn, merge):
-		old_account = self.get_account(olddn)
+		if self.is_group:
+			old_account = self.get_account()
+		else:
+			old_account = self.get_account(olddn)
 
 		if old_account:
 			new_account = None