From 627302d851c3d4ec4d270d94bdec8a72e2d8806a Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Mon, 12 Sep 2022 08:48:20 +0000
Subject: [PATCH] fix: set `doctype` and `name` in docinfo (#18088)

---
 frappe/desk/form/load.py              |  2 ++
 frappe/public/js/frappe/model/sync.js | 13 ++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index dbc23b3151..76b2a80ea9 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -110,6 +110,8 @@ def get_docinfo(doc=None, doctype=None, name=None):
 
 	docinfo.update(
 		{
+			"doctype": doc.doctype,
+			"name": doc.name,
 			"attachments": get_attachments(doc.doctype, doc.name),
 			"communications": communications_except_auto_messages,
 			"automated_messages": automated_messages,
diff --git a/frappe/public/js/frappe/model/sync.js b/frappe/public/js/frappe/model/sync.js
index a8f8851ebe..b9481dca96 100644
--- a/frappe/public/js/frappe/model/sync.js
+++ b/frappe/public/js/frappe/model/sync.js
@@ -56,16 +56,11 @@ Object.assign(frappe.model, {
 	sync_docinfo: (r) => {
 		// set docinfo (comments, assign, attachments)
 		if (r.docinfo) {
-			var doc;
-			if (r.docs) {
-				doc = r.docs[0];
-			} else {
-				if (cur_frm) doc = cur_frm.doc;
-			}
-			if (doc) {
-				if (!frappe.model.docinfo[doc.doctype]) frappe.model.docinfo[doc.doctype] = {};
-				frappe.model.docinfo[doc.doctype][doc.name] = r.docinfo;
+			const { doctype, name } = r.docinfo;
+			if (!frappe.model.docinfo[doctype]) {
+				frappe.model.docinfo[doctype] = {};
 			}
+			frappe.model.docinfo[doctype][name] = r.docinfo;
 
 			// copy values to frappe.boot.user_info
 			Object.assign(frappe.boot.user_info, r.docinfo.user_info);