Skip to content

Commit

Permalink
fix: avoid name clash in delivery stop (backport #37306) (#37701)
Browse files Browse the repository at this point in the history
fix: avoid name clash in delivery stop (#37306)

* fix(stock): avoid name clash in delivery stop with Document.lock()

* chore(stock): format delivery stop json according to doctype builder

(cherry picked from commit 6817821)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
  • Loading branch information
mergify[bot] and blaggacao authored Oct 26, 2023
1 parent c58fefb commit 556095d
Show file tree
Hide file tree
Showing 5 changed files with 203 additions and 813 deletions.
1 change: 1 addition & 0 deletions erpnext/patches.txt
Original file line number Diff line number Diff line change
Expand Up @@ -343,5 +343,6 @@ erpnext.patches.v14_0.correct_asset_value_if_je_with_workflow
erpnext.patches.v14_0.migrate_deferred_accounts_to_item_defaults
erpnext.patches.v14_0.create_accounting_dimensions_in_sales_order_item
erpnext.patches.v14_0.rename_over_order_allowance_field
erpnext.patches.v14_0.migrate_delivery_stop_lock_field
# below migration patch should always run last
erpnext.patches.v14_0.migrate_gl_to_payment_ledger
7 changes: 7 additions & 0 deletions erpnext/patches/v14_0/migrate_delivery_stop_lock_field.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import frappe
from frappe.model.utils.rename_field import rename_field


def execute():
if frappe.db.has_column("Delivery Stop", "lock"):
rename_field("Delivery Stop", "lock", "locked")
Loading

0 comments on commit 556095d

Please sign in to comment.