Skip to content

refactor!: switch to creation sort by ankush [frappe] PR#40699

Bot Dokos requested to merge ft-pr-40699 into develop

From: https://github.com/frappe/erpnext/pull/40699
Date: 2024-03-27 13:45:34+05:30

  • refactor!: switch to creation sort (#40699)


Diagnostics

Conflicts detected for source commit: dfde490c02065fed217bd1f47dc3e2bf48afa63e
- DU erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
- DU erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
- DU erpnext/accounts/doctype/cashier_closing/cashier_closing.json
- DU erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json
- DU erpnext/accounts/doctype/process_subscription/process_subscription.json
- DU erpnext/accounts/doctype/subscription_invoice/subscription_invoice.json
- DU erpnext/accounts/doctype/subscription_settings/subscription_settings.json
- DU erpnext/accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
- DU erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json
- DU erpnext/assets/doctype/asset_shift_factor/asset_shift_factor.json
- DU erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
- DU erpnext/setup/doctype/website_item_group/website_item_group.json
pre-commit failed for source commit: dfde490c02065fed217bd1f47dc3e2bf48afa63e
check json...............................................................Failed
- hook id: check-json
- exit code: 1

erpnext/accounts/doctype/bank_account/bank_account.json: Failed to json decode (Duplicate key: links)




Suspicious changes found (dokos|telemetry|shipping_rule|capture_doc):
  15cb8839ee7047b501e5cbd58121942030050434 refactor!: switch to creation sort (#40699)


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-40699

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-40699

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports