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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2026-02-03 10:38:39 +05:30
parent 4963261dc8
commit d2ea428030
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches.txt
View File

@@ -458,9 +458,6 @@ erpnext.patches.v16_0.update_corrected_cancelled_status
erpnext.patches.v16_0.fix_barcode_typo erpnext.patches.v16_0.fix_barcode_typo
erpnext.patches.v16_0.set_post_change_gl_entries_on_pos_settings erpnext.patches.v16_0.set_post_change_gl_entries_on_pos_settings
execute:frappe.delete_doc_if_exists("Workspace Sidebar", "Opening & Closing") execute:frappe.delete_doc_if_exists("Workspace Sidebar", "Opening & Closing")
<<<<<<< HEAD
erpnext.patches.v15_0.create_accounting_dimensions_in_advance_taxes_and_charges erpnext.patches.v15_0.create_accounting_dimensions_in_advance_taxes_and_charges
erpnext.patches.v16_0.set_ordered_qty_in_quotation_item erpnext.patches.v16_0.set_ordered_qty_in_quotation_item
=======
erpnext.patches.v16_0.migrate_transaction_deletion_task_flags_to_status # 2 erpnext.patches.v16_0.migrate_transaction_deletion_task_flags_to_status # 2
>>>>>>> 0fb37ad792 (feat(Transaction Deletion Record): Editable "DocTypes To Delete" List with CSV import/export (#50592))