From f1ff388563e9fb2bbaf81ecac40b567f6211d7c4 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Sun, 4 May 2014 18:33:54 +0530
Subject: [PATCH] Fix in open mapped doc. Fixes frappe/erpnext#1575

---
 frappe/model/mapper.py                      | 4 ++--
 frappe/public/js/frappe/model/create_new.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/model/mapper.py b/frappe/model/mapper.py
index 0cd390f553..32992f1de2 100644
--- a/frappe/model/mapper.py
+++ b/frappe/model/mapper.py
@@ -9,8 +9,6 @@ from frappe.model import default_fields
 
 def get_mapped_doc(from_doctype, from_docname, table_maps, target_doc=None,
 		postprocess=None, ignore_permissions=False):
-	if isinstance(target_doc, basestring):
-		target_doc = json.loads(target_doc)
 
 	source_doc = frappe.get_doc(from_doctype, from_docname)
 
@@ -21,6 +19,8 @@ def get_mapped_doc(from_doctype, from_docname, table_maps, target_doc=None,
 	# main
 	if not target_doc:
 		target_doc = frappe.new_doc(table_maps[from_doctype]["doctype"])
+	elif isinstance(target_doc, basestring):
+		target_doc = frappe.get_doc(json.loads(target_doc))
 
 	if not target_doc.has_permission("create"):
 		target_doc.raise_no_permission_to("create")
diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js
index bca567c05d..b2f0afc2c0 100644
--- a/frappe/public/js/frappe/model/create_new.js
+++ b/frappe/public/js/frappe/model/create_new.js
@@ -193,11 +193,11 @@ $.extend(frappe.model, {
 				method: opts.method,
 				args: {
 					"source_name": opts.source_name,
-					"target_doclist": cur_frm.doc
+					"target_doc": cur_frm.doc
 				},
 				callback: function(r) {
 					if(!r.exc) {
-						var doclist = frappe.model.sync(r.message);
+						var doc = frappe.model.sync(r.message);
 						cur_frm.refresh();
 					}
 				}