mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-23 00:28:30 +00:00
Merge branch 'version-16' into version-16-hotfix
This commit is contained in:
@@ -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):
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user