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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-03-05 14:54:40 +05:30
committed by GitHub
parent 941d67a0b6
commit fe8c9a3605
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/patches.txt
View File

@@ -261,14 +261,7 @@ erpnext.patches.v14_0.show_loan_management_deprecation_warning
erpnext.patches.v14_0.clear_reconciliation_values_from_singles
execute:frappe.rename_doc("Report", "TDS Payable Monthly", "Tax Withholding Details", force=True)
erpnext.patches.v14_0.update_proprietorship_to_individual
<<<<<<< HEAD
<<<<<<< HEAD
erpnext.patches.v15_0.rename_subcontracting_fields
=======
erpnext.stock.doctype.purchase_receipt_item.patches.rename_field_from_rate_difference_to_amount_difference
>>>>>>> 17d415b105 (fix: set landed cost based on purchase invoice rate)
=======
>>>>>>> 154e9813c4 (fix: revert last commit)
[post_model_sync]
erpnext.patches.v15_0.create_asset_depreciation_schedules_from_assets