From ebf38c5ebd405cf53b99b561f4619f1f0c366729 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Mon, 12 Aug 2019 12:17:16 +0530
Subject: [PATCH] fix: misc fixes (#18616)

---
 erpnext/stock/doctype/item/item.json                       | 1 -
 erpnext/stock/doctype/purchase_receipt/purchase_receipt.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index a142bb90354..383fb61f519 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -468,7 +468,6 @@
    },
    {
     "default": "0",
-    "depends_on": "has_batch_no",
     "fieldname": "retain_sample",
     "fieldtype": "Check",
     "label": "Retain Sample"
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 7da648aad99..8266055d699 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -190,7 +190,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
 					frappe.set_route("Form", doc.doctype, doc.name);
 				}
 				else {
-					frappe.msgprint(__("Retention Stock Entry already created or Sample Quantity not provided"));
+					frappe.msgprint(__("Purchase Receipt doesn't have any Item for which Retain Sample is enabled."));
 				}
 			}
 		});