nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-16 10:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
barredterra
2026-08-26 04:38:18 +02:00
parent 9ce6e6c5c4
commit 335a78decd
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/patches/v16_0/migrate_asset_type_checkboxes_to_select.py
View File

@@ -3,19 +3,6 @@ from frappe.query_builder import Case
def execute(): def execute():
<<<<<<< HEAD
required_columns = [
"is_existing_asset",
"is_composite_asset",
"is_composite_component",
]
# Skip patch if any required column is missing
if not all(frappe.db.has_column("Asset", col) for col in required_columns):
return
Asset = frappe.qb.DocType("Asset")
=======
# v15 sites never had is_composite_component; only migrate columns that exist. # v15 sites never had is_composite_component; only migrate columns that exist.
column_values = ( column_values = (
("is_existing_asset", "Existing Asset"), ("is_existing_asset", "Existing Asset"),
@@ -25,7 +12,6 @@ def execute():
existing = [(col, value) for col, value in column_values if frappe.db.has_column("Asset", col)] existing = [(col, value) for col, value in column_values if frappe.db.has_column("Asset", col)]
if not existing: if not existing:
return return
>>>>>>> 6bdc18b (fix(asset): skip missing checkbox columns in asset type patch (#58416))
Asset = frappe.qb.DocType("Asset") Asset = frappe.qb.DocType("Asset")
case = Case() case = Case()