fix: merge conflicts and sider issues

This commit is contained in:
Nabin Hait
2022-06-10 11:15:22 +05:30
parent 6acd0325be
commit f904ac599e
35 changed files with 1974 additions and 734 deletions

View File

@@ -375,3 +375,4 @@ execute:frappe.delete_doc("DocType", "Naming Series")
erpnext.patches.v13_0.set_payroll_entry_status
erpnext.patches.v13_0.job_card_status_on_hold
erpnext.patches.v14_0.migrate_gl_to_payment_ledger
erpnext.patches.v14_0.crm_ux_cleanup