diff --git a/erpnext/__init__.py b/erpnext/__init__.py index b5ded4ee0fa..cd0d56fca5f 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -6,7 +6,7 @@ import frappe from frappe.model.document import Document from frappe.utils.user import is_website_user -__version__ = "16.3.0" +__version__ = "16.7.3" def get_default_company(user=None): diff --git a/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json b/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json index eb75add1aba..7a4b953696a 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, +<<<<<<< version-16-hotfix "modified": "2026-02-26 10:45:47.970714", +======= + "modified": "2026-02-26 10:50:47.970714", +>>>>>>> version-16 "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 8feef0073f5..890e092b21a 100644 --- a/erpnext/assets/onboarding_step/learn_asset/learn_asset.json +++ b/erpnext/assets/onboarding_step/learn_asset/learn_asset.json @@ -8,7 +8,11 @@ "is_complete": 0, "is_single": 0, "is_skipped": 0, +<<<<<<< version-16-hotfix "modified": "2026-02-26 10:44:59.557156", +======= + "modified": "2026-02-26 10:50:59.557156", +>>>>>>> version-16 "modified_by": "Administrator", "name": "Learn Asset", "owner": "Administrator",