[rename] [fix] merge related fixes

setup/doctype/company/company.py

@@ -16,6 +16,7 @@
 
 from __future__ import unicode_literals
 import webnotes
+from webnotes import _, msgprint
 
 from webnotes.utils import cstr
 from webnotes.model.doc import Document
@@ -288,6 +289,9 @@ class DocType:
 			and value=%s""", self.doc.name)
 			
 	def on_rename(self,newdn,olddn, merge=False):
+		if merge:
+			msgprint(_("Sorry. Companies cannot be merged"), raise_exception=True)
+		
 		webnotes.conn.sql("""update `tabCompany` set company_name=%s
 			where name=%s""", (newdn, olddn))