nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-01 04:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-08-14 12:04:30 +05:30
parent 1cddb4ff39
commit 8882b85888
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

@@ -357,15 +357,7 @@ erpnext.patches.v14_0.clear_reconciliation_values_from_singles
erpnext.patches.v14_0.update_total_asset_cost_field
erpnext.patches.v14_0.create_accounting_dimensions_in_reconciliation_tool
erpnext.patches.v14_0.update_flag_for_return_invoices #2024-03-22
<<<<<<< HEAD
=======
erpnext.patches.v15_0.create_accounting_dimensions_in_payment_request
<<<<<<< HEAD
erpnext.patches.v15_0.update_pos_return_ledger_entries
>>>>>>> 4dc0d3a003 (refactor: update patches.txt)
=======
erpnext.patches.v14_0.update_pos_return_ledger_entries
>>>>>>> da2286802a (refactor: move patch to v14 and update patches.txt)
# below migration patch should always run last
erpnext.patches.v14_0.migrate_gl_to_payment_ledger
erpnext.stock.doctype.delivery_note.patches.drop_unused_return_against_index # 2023-12-20