nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: conflicts

Browse Source
This commit is contained in:
s-aga-r
2023-01-31 16:14:45 +05:30
parent df72e4a221
commit 075c547184
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches.txt
View File

@@ -325,8 +325,5 @@ erpnext.patches.v14_0.setup_clear_repost_logs
erpnext.patches.v14_0.create_accounting_dimensions_for_payment_request erpnext.patches.v14_0.create_accounting_dimensions_for_payment_request
erpnext.patches.v14_0.update_entry_type_for_journal_entry erpnext.patches.v14_0.update_entry_type_for_journal_entry
erpnext.patches.v14_0.change_autoname_for_tax_withheld_vouchers erpnext.patches.v14_0.change_autoname_for_tax_withheld_vouchers
<<<<<<< HEAD
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
>>>>>>> be41052dc8 (chore: add `status` field in `Pick List`)