CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 17:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-03-05 12:55:10 +05:30
committed by GitHub
parent af49f5a8af
commit f29c43811c
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/patches.txt
View File

@@ -392,15 +392,7 @@ erpnext.patches.v15_0.migrate_checkbox_to_select_for_reconciliation_effect
erpnext.patches.v15_0.sync_auto_reconcile_config
execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_posting_date", "Payment")
erpnext.patches.v14_0.disable_add_row_in_gross_profit
<<<<<<< HEAD
erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment
erpnext.patches.v14_0.update_posting_datetime
<<<<<<< HEAD
erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes
=======
erpnext.patches.v14_0.update_posting_datetime
erpnext.support.doctype.service_level_agreement.patches.rename_sla_fields
>>>>>>> baa0dd1235 (fix: rename some sla fields)
=======
erpnext.patches.v15_0.rename_sla_fields
>>>>>>> dcec446e55 (fix: patch path)