mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-21 03:04:34 +00:00
fix: patch path
(cherry picked from commit dcec446e55)
# Conflicts:
# erpnext/patches.txt
This commit is contained in:
@@ -395,8 +395,12 @@ erpnext.patches.v14_0.disable_add_row_in_gross_profit
|
|||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment
|
erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment
|
||||||
erpnext.patches.v14_0.update_posting_datetime
|
erpnext.patches.v14_0.update_posting_datetime
|
||||||
|
<<<<<<< HEAD
|
||||||
erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes
|
erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes
|
||||||
=======
|
=======
|
||||||
erpnext.patches.v14_0.update_posting_datetime
|
erpnext.patches.v14_0.update_posting_datetime
|
||||||
erpnext.support.doctype.service_level_agreement.patches.rename_sla_fields
|
erpnext.support.doctype.service_level_agreement.patches.rename_sla_fields
|
||||||
>>>>>>> baa0dd1235 (fix: rename some sla fields)
|
>>>>>>> baa0dd1235 (fix: rename some sla fields)
|
||||||
|
=======
|
||||||
|
erpnext.patches.v15_0.rename_sla_fields
|
||||||
|
>>>>>>> dcec446e55 (fix: patch path)
|
||||||
|
|||||||
Reference in New Issue
Block a user