Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Conflicts

Browse Source
This commit is contained in:
Deepesh Garg 2022-02-07 22:12:27 +05:30 committed by GitHub
parent c53cdce1c0
commit eab10a13e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/patches.txt
View File

@ -324,11 +324,6 @@ erpnext.patches.v13_0.update_tax_category_for_rcm
execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings') execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings')
erpnext.patches.v14_0.set_payroll_cost_centers erpnext.patches.v14_0.set_payroll_cost_centers
erpnext.patches.v13_0.agriculture_deprecation_warning erpnext.patches.v13_0.agriculture_deprecation_warning
<<<<<<< HEAD
<<<<<<< HEAD
=======
erpnext.patches.v13_0.update_maintenance_schedule_field_in_visit
>>>>>>> fedeb2a70f (chore: remove patch)
erpnext.patches.v13_0.hospitality_deprecation_warning erpnext.patches.v13_0.hospitality_deprecation_warning
erpnext.patches.v13_0.update_exchange_rate_settings erpnext.patches.v13_0.update_exchange_rate_settings
erpnext.patches.v13_0.update_asset_quantity_field erpnext.patches.v13_0.update_asset_quantity_field
@ -347,6 +342,3 @@ erpnext.patches.v14_0.restore_einvoice_fields
erpnext.patches.v13_0.update_sane_transfer_against erpnext.patches.v13_0.update_sane_transfer_against
erpnext.patches.v12_0.add_company_link_to_einvoice_settings erpnext.patches.v12_0.add_company_link_to_einvoice_settings
erpnext.patches.v14_0.migrate_cost_center_allocations erpnext.patches.v14_0.migrate_cost_center_allocations
=======
erpnext.patches.v13_0.set_billed_amount_in_returned_dn
>>>>>>> fc65a3d989 (feat: add patch)