commit 05d2c7f9ae9e50e46098703b1b2f3e083d2b2e6b
author Anand Baburajan <anandbaburajan@gmail.com> Tue Nov 01 17:45:23 2022 +0530
committer GitHub <noreply@github.com> Tue Nov 01 17:45:23 2022 +0530
tree 18c57158c5de083e3a9aa7e107bccb50bfa493c6
parent f322c608cf7acbb8c5928f151876a2e5ddc13595
parent 1d83fb20d6678a2495c128380969b673ebc41b1a

Merge branch 'develop' into asset_bill_date_new

erpnext/assets/doctype/asset/asset.js

diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index 5512d41..7e54219 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -432,7 +432,11 @@
 
 	set_values_from_purchase_doc: function(frm, doctype, purchase_doc) {
 		frm.set_value('company', purchase_doc.company);
-		frm.set_value('purchase_date', purchase_doc.posting_date);
+		if (purchase_doc.bill_date) {
+			frm.set_value('purchase_date', purchase_doc.bill_date);
+		} else {
+			frm.set_value('purchase_date', purchase_doc.posting_date);
+		}
 		const item = purchase_doc.items.find(item => item.item_code === frm.doc.item_code);
 		if (!item) {
 			doctype_field = frappe.scrub(doctype)