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

2012-10-26 11:25:34 +02:00 · 2012-10-26 11:25:34 +02:00 · 46d20d430f
commit 46d20d430f
parent 44aed5eab9 ca77c6b0b7
1 changed files with 4 additions and 0 deletions
--- a/stock/doctype/warehouse/warehouse.py
+++ b/stock/doctype/warehouse/warehouse.py
@ -100,6 +100,10 @@ class DocType:
 			self.repost(item_code[0], self.doc.merge_with)
 			
 		webnotes.conn.auto_commit_on_many_writes = 0
+		
+		msgprint("Warehouse %s merged into %s. Now you can delete warehouse: %s" 
+			% (self.doc.name, self.doc.merge_with, self.doc.name))
+		

 	def repost(self, item_code, warehouse=None):
 		bin = self.get_bin(item_code, warehouse)