From 5d2822df978f97e3a1f6f434bf3a27afb262f264 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 26 Feb 2026 10:47:56 +0530 Subject: [PATCH] fix: broekn link of docs in asset onboarding (cherry picked from commit 1cdf439e38f4d0364e238e972bc0996d374f961b) (cherry picked from commit 5c48f74d4c1a833f40e6eca37de087080ebb2b49) # Conflicts: # erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json # erpnext/assets/onboarding_step/learn_asset/learn_asset.json --- .../asset_onboarding/asset_onboarding.json | 4 ++++ erpnext/assets/onboarding_step/learn_asset/learn_asset.json | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json b/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json index fe4bac23091..6985d41775d 100644 --- a/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json +++ b/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json @@ -15,7 +15,11 @@ "doctype": "Module Onboarding", "idx": 0, "is_complete": 0, +<<<<<<< HEAD "modified": "2026-02-23 22:51:11.027665", +======= + "modified": "2026-02-26 10:45:47.970714", +>>>>>>> 5c48f74d4c (fix: broekn link of docs in asset onboarding) "modified_by": "Administrator", "module": "Assets", "name": "Asset Onboarding", diff --git a/erpnext/assets/onboarding_step/learn_asset/learn_asset.json b/erpnext/assets/onboarding_step/learn_asset/learn_asset.json index 54377ef0ac2..8e02f16cff4 100644 --- a/erpnext/assets/onboarding_step/learn_asset/learn_asset.json +++ b/erpnext/assets/onboarding_step/learn_asset/learn_asset.json @@ -8,11 +8,15 @@ "is_complete": 0, "is_single": 0, "is_skipped": 0, +<<<<<<< HEAD "modified": "2026-02-23 22:44:25.734547", +======= + "modified": "2026-02-26 10:44:59.557156", +>>>>>>> 5c48f74d4c (fix: broekn link of docs in asset onboarding) "modified_by": "Administrator", "name": "Learn Asset", "owner": "Administrator", - "path": "https://docs.frappe.io/erpnext/assets/setup/asset-category", + "path": "https://docs.frappe.io/erpnext/assets/introduction", "show_form_tour": 0, "show_full_form": 0, "title": "Learn Asset",