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

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2023-03-30 12:15:56 +05:30
committed by GitHub
parent 5e98679f91
commit bc94358e98
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/patches.txt
View File

@@ -326,10 +326,7 @@ erpnext.patches.v14_0.change_autoname_for_tax_withheld_vouchers
erpnext.patches.v14_0.update_asset_value_for_manual_depr_entries erpnext.patches.v14_0.update_asset_value_for_manual_depr_entries
erpnext.patches.v14_0.set_pick_list_status erpnext.patches.v14_0.set_pick_list_status
erpnext.patches.v13_0.update_docs_link erpnext.patches.v13_0.update_docs_link
# below migration patches should always run last
erpnext.patches.v14_0.migrate_gl_to_payment_ledger
<<<<<<< HEAD
=======
execute:frappe.delete_doc_if_exists("Report", "Tax Detail") execute:frappe.delete_doc_if_exists("Report", "Tax Detail")
erpnext.patches.v15_0.enable_all_leads erpnext.patches.v15_0.enable_all_leads
>>>>>>> ad11934d39 (fix: enabling lead even after "Opportunity" created against it (#34627)) # below migration patches should always run last
erpnext.patches.v14_0.migrate_gl_to_payment_ledger