From d98ce05460b068a591da7e31fa1865a2bd53e9c3 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 20 Dec 2012 11:01:09 +0530
Subject: [PATCH] import merge, remove Core

---
 public/js/wn/ui/appframe.js      | 1 +
 webnotes/modules/import_merge.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/js/wn/ui/appframe.js b/public/js/wn/ui/appframe.js
index 73d5270f7f..a46d70affe 100644
--- a/public/js/wn/ui/appframe.js
+++ b/public/js/wn/ui/appframe.js
@@ -50,6 +50,7 @@ wn.ui.AppFrame = Class.extend({
 	},
 	
 	add_module_tab: function(module) {
+		if(!erpnext.modules[module]) return;
 		this.add_tab('<span class="small-module-icons small-module-icons-'+
 			module.toLowerCase()+'"></span>'+' <span>'
 			+ wn._(module) + "</span>", 0.7, function() {
diff --git a/webnotes/modules/import_merge.py b/webnotes/modules/import_merge.py
index 77b20a7475..0b2f9a16ae 100644
--- a/webnotes/modules/import_merge.py
+++ b/webnotes/modules/import_merge.py
@@ -76,6 +76,7 @@ class UpdateDocument:
 	def __init__(self, in_doclist=[]):
 		self.in_doclist = in_doclist
 		self.doc = Document(fielddata = in_doclist[0])
+		self.old_doc = None
 		self.modified = self.doc.modified # make a copy
 		self.doclist = []