CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 03:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolving conflicts

Browse Source
This commit is contained in:
Subin Tom
2021-08-31 19:27:48 +05:30
committed by GitHub
parent ead1397a75
commit 634abb783f
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

@@ -305,11 +305,8 @@ erpnext.patches.v13_0.add_custom_field_for_south_africa #2
erpnext.patches.v13_0.rename_discharge_ordered_date_in_ip_record
erpnext.patches.v13_0.migrate_stripe_api
erpnext.patches.v13_0.reset_clearance_date_for_intracompany_payment_entries
<<<<<<< HEAD
=======
erpnext.patches.v13_0.einvoicing_deprecation_warning
erpnext.patches.v13_0.custom_fields_for_taxjar_integration
erpnext.patches.v14_0.delete_einvoicing_doctypes
>>>>>>> 7004944cc0 (feat: Taxjar Integration update (#27143))
erpnext.patches.v13_0.set_operation_time_based_on_operating_cost
erpnext.patches.v13_0.validate_options_for_data_field