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

chore: resolve conflicts

Browse Source 
Removed old patch entries and updated the list.
This commit is contained in:
Mihir Kandoi
2026-01-31 20:20:36 +05:30
committed by GitHub
parent 4017936bef
commit c3b92075f0
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/patches.txt
View File

@@ -428,9 +428,4 @@ execute:frappe.db.set_single_value("Accounts Settings", "show_party_balance", 1)
execute:frappe.db.set_single_value("Accounts Settings", "show_account_balance", 1) execute:frappe.db.set_single_value("Accounts Settings", "show_account_balance", 1)
erpnext.patches.v16_0.update_currency_exchange_settings_for_frankfurter #2025-12-11 erpnext.patches.v16_0.update_currency_exchange_settings_for_frankfurter #2025-12-11
erpnext.patches.v15_0.create_accounting_dimensions_in_advance_taxes_and_charges erpnext.patches.v15_0.create_accounting_dimensions_in_advance_taxes_and_charges
<<<<<<< HEAD
=======
execute:frappe.delete_doc_if_exists("Workspace Sidebar", "Opening & Closing")
erpnext.patches.v16_0.migrate_transaction_deletion_task_flags_to_status # 2
erpnext.patches.v16_0.set_ordered_qty_in_quotation_item erpnext.patches.v16_0.set_ordered_qty_in_quotation_item
>>>>>>> 4cc306d2d8 (fix: validate over ordering of quotation)