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

chore: resolve conflicts

Browse Source
This commit is contained in:
AarDG10
2026-09-01 12:51:04 +05:30
parent 4b89ddffde
commit 9ee421424f
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches.txt
View File

@@ -502,11 +502,7 @@ erpnext.patches.v16_0.recalculate_purchase_receipt_billing_status
erpnext.patches.v16_0.add_currency_to_blanket_orders
erpnext.patches.v16_0.repair_work_order_material_transfer
erpnext.patches.v16_0.remove_frappe_crm_custom_fields
<<<<<<< HEAD
erpnext.patches.v16_0.rename_secondary_item_type_field
erpnext.patches.v16_0.append_fieldname_to_pos_search_fields
erpnext.patches.v16_0.set_secondary_item_valuation_type
=======
erpnext.patches.v16_0.add_batch_split_stock_entry_type
erpnext.patches.v16_0.add_transaction_roles_to_sms_settings
>>>>>>> 3501beb (fix(sms_settings): add patch to pre-fill roles into SMS Settings Roles Table)